facebook login working
Merge branch 'master' of https://github.com/weibohe/dealaroundyou

Conflicts:
	DealAroundYou/en.lproj/MainStoryboard.storyboard