Facebook login + registration
Merge remote-tracking branch 'origin/master' into fb_test
merging from github