persist user data to api and stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	BlackmailBox/ViewControllers/PromiseDateViewController.m