Added settings functionality
Merge branch 'master' of github.com:acreations/rockit-server