promise show view
Merge branch 'master' of https://github.com/blackmailbox/blackmailbox-iphone

Conflicts:
	BlackmailBox/en.lproj/MainStoryboard.storyboard
fix some bugz