Facilities ui
Merge branch 'master' of https://github.com/lakario/HackForLA

Conflicts:
	app/js/app.js