Merge branch 'master' into controller
Merge branch 'controller' into mauricio
Developer stuff
Merge branch 'master' into controller

Conflicts:
	src/Controllers/BoardController.java
Merge branch 'controller' into mauricio
Merge
Merge branch 'mauricio' into controller
Action listeners calling functions
Merge branch 'master' into controller
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Merge branch 'controller'