Merge settings menu code

Author Sasky <sky42ks@gmail.com>
Author date 2014-06-21 12:56:59
Author local date 2014-06-21 05:56:59 -0700
Committer Sasky <sky42ks@gmail.com>
Committer date 2014-06-21 12:56:59
Committer local date 2014-06-21 05:56:59 -0700
Commit 2c689a06beaf76bd58f8d692d250c9bee91cbf53
Tree c9734a8013efa40bde6ff3283058183b3ab738eb
Parent 0470e88fc99042b7e4dbc099a1e470a85a7c1576
Merge settings menu code