Generacion de modelo y formulario para materiales
Merge branch 'master' of https://github.com/macartuche/architects

Conflicts:
	app/routes.php