[보람] 페이스북 회원가입
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/js/app.js
	app/js/index.js