added config menu parsing
Merge branch 'master' of github.com:spottradingllc/zoom into feature-config-menus

Conflicts:
	client/viewmodels/serverConfig.js
	client/views/serverConfig.html
removed duplicate app state registration
changed allowed_instances to use get_children instead of stat.numChildren
doc strings
Merge pull request #49 from spottradingllc/bugfix-app-status

Bugfix app status
Merge pull request #47 from spottradingllc/feature-config-menus

Feature config menus
Merge branch 'master' of github.com:spottradingllc/zoom into ui-cleanup

Conflicts:
	client/styles/app/spot.css
	client/viewmodels/serverConfig.js
	client/views/applicationState.html