code review
Merge branch 'master' of ssh://github.com/accucode/paragon-server

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