Revert "Merge branch 'bug-fixing-branch' into zmc"

This reverts commit 1faf8572a561dc84bcbfce5764b36fab775dfb68, reversing
changes made to b68bd0d11b88d51338e8477ea0cd0bebb171f780.
Revert "Merge remote-tracking branch 'origin/zmc' into bug-fixing-branch"

Conflicts:
	pa/ThePaApp.xcodeproj/project.pbxproj
	pa/ThePaApp/AppDelegate.m
	pa/ThePaApp/LoginViewController.m