Beginning implementation of user options
Merge branch 'development' of github.com:MakersSpark/Maker-Spark-Server into development