Moved settings app development to the settings branch
Correction merge from master
Finished basic functionality for Settings App
Merged settings branch to include new settings system app