Merge remote-tracking branch 'origin/swing' into swing

Conflicts:
	src/beanControllers/Bean.java
	src/controllers/GranController.java
Merge remote-tracking branch 'origin/reSwing' into swing