Template  gestor y csssssssss!!!
Templates y CSS
Merge branch 'master' of https://github.com/jlvarela/SAGPro

Conflicts:
	SAGProWeb/web/resources/css/bootstrap.css