add fb login
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/index.html
	app/scripts/controllers/main.js
	bower.json
fix login module
fix login module
Merge pull request #2 from zard17/master

add facebook login function