Moved settings app development to the settings branch
Moved feedback app development to its own branch
Merging new simulator.js and new unit testing framework from master
merging
Correction merge from master
Finished basic functionality for Settings App
Merged settings branch to include new settings system app
Updated README.md with documentation for new version
Merged in master and completed initial work on feedback app
Merge pull request #12 from BluelineApps/feedback

Feedback
Merging updates from master