Estilo formulario (Prueba)
Actualización sobre .gitignore
Merge
Merge branch 'master' of github.com:Mosheman/sigm3

Conflicts:
	sigm-ejb/dist/sigm-ejb.jar
	sigm-war/build/web/WEB-INF/classes/managedbeans/UserController$1.class
	sigm-war/build/web/user/Create.xhtml
	sigm-war/dist/sigm-war.war
	sigm-war/web/user/Create.xhtml
	sigm/build/sigm-ejb.jar
	sigm/build/sigm-war.war
	sigm/dist/gfdeploy/sigm/sigm-war_war/WEB-INF/classes/managedbeans/UserController$1.class
	sigm/dist/gfdeploy/sigm/sigm-war_war/user/Create.xhtml
	sigm/dist/sigm.ear