settings mostly
Merge branch 'master' of https://github.com/accucode/paragon-server

Conflicts:
	java/source/com/app/ui/servlet/base/MyActivityRegistryBase.java