Change main angular settingCtrl
* Update code to reflect changes
Cleanup
Merge pull request #11 from sjsandy/develop

Develop
Merge pull request #12 from sjsandy/work/nav1200

Work/nav1200