Facebook login to get name.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client
Nodejitsu deployment fixes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client