commit de prueba de miroku
Merge branch 'master' of https://github.com/Fabianko/taa-2.0-pingeso2013-2

Conflicts:
	taa-2.0/taa-2.0-war/web/building.xhtml