Merge origin/master

Conflicts:
	src/main/java/cl/dogu/epv/admin/AdminHome.java
	src/main/webapp/tipo_usuario/admin/home.xhtml
Merge origin/master

Conflicts:
	src/main/java/cl/dogu/epv/admin/AdminHome.java
	src/main/webapp/tipo_usuario/admin/home.xhtml