merged
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/pt/adrz/gymlogger/controller/AbstractController.java
	src/pt/adrz/gymlogger/controller/GymController.java
	target/classes/pt/adrz/gymlogger/controller/GymController.class