Login con facebook en JS

Diego
Merge branch 'dev' of https://github.com/tonklis/torre_centenario into dev

Conflicts:
	app/views/display/index.html.erb