Firebase and Leaflet.JS
Merge branch 'master' of https://github.com/guigacarvalho/museum

Conflicts:
	app/controllers/registration.js
	app/styles/app.css