pull
Merge branch 'master' of github.com:accucode/paragon-server

Conflicts:
	java/source/com/app/ui/activity/test/MyManageAccountsPage.java