Merge pull request #8 from LucasPadovan/mixing

Avances con modales y rutas + Mixing con lo tuyo
Mini cambios
Fixes en buildings
Vergüenza....
Algunos fixes mas ^^
Merge branch 'mixing-nestor' of github.com:FRM-UTN/firehouse into mixing

Conflicts:
	app/controllers/people_controller.rb
	app/views/people/_form.html.erb
	app/views/people/_new.html.erb
content_types
Merge branch 'mixing' into arreglos

Conflicts:
	app/views/mobile_interventions/_building.html.erb
mapas de google maps para intervenciones