trying to add facebook
Merge commit '1545930009d686f0fa7ce78742454b74840dc0f7'

Conflicts:
	app/js/app.js