commenting out work in progress
Merge branch 'master' of github.com:accucode/paragon-server

Conflicts:
	java/source/com/app/ui/activity/login/MyHandleInvitationActivity.java