swing con contexto
Merge branch 'reSwing' into develop

Conflicts:
	src/beanControllers/ColocarBean.java
	src/beanControllers/IniciarBean.java
	src/controllers/GranController.java
	src/controllers/IniciarController.java
	src/controllers/ejb/ContinuarControllerEjb.java
	src/controllers/ejb/GranControllerEjb.java
	src/controllers/ejb/IniciarControllerEjb.java
no trazas