Cambios en controlador principal
Merge branch 'master' of https://github.com/XuUmSdBvOUZd4KtSNwzb/Vista

Conflicts:
	PrincipalControllerBeans.java
Cambios en controlador principal