Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/WEB-INF/faces-config.xml
Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/WEB-INF/faces-config.xml
 Exception Handling  finished