added forgot password button
Merge branch '3.0-oops' into 3.0-push. Accidentally amended the last commit.

Conflicts:
	Off the Record/OTRDatabaseUnlockViewController.m