PrimeFaces
Merge branch 'master' of https://github.com/clupin/AutomotoraFingeso

Conflicts:
	Automotora-ejb/nbproject/private/private.properties
	Automotora-war/nbproject/build-impl.xml
	Automotora-war/nbproject/genfiles.properties
	Automotora-war/nbproject/private/private.properties
	Automotora-war/nbproject/private/private.xml
	Automotora-war/nbproject/project.properties
	Automotora-war/nbproject/project.xml
	Automotora-war/web/WEB-INF/web.xml
	nbproject/private/private.properties