push
Merge remote-tracking branch 'origin/zmc' into bug-fixing-branch

Conflicts:
	pa/ThePaApp.xcodeproj/project.pbxproj
	pa/ThePaApp/AppDelegate.m
	pa/ThePaApp/LoginViewController.m
Revert 7819384..213f850

This rolls back to commit 7819384d5125f32e1cdaaa9881ae1f57f79a8e51.