Merge branch 'master' of https://github.com/overriderb/gym3000 into Logger-Implementation

Conflicts:
	src/main/java/org/gym/Factory.java
	src/main/java/org/gym/dao/DatabaseHelper.java
Merge branch 'master' of https://github.com/overriderb/gym3000 into Logger-Implementation

Conflicts:
	src/main/java/org/gym/Factory.java
	src/main/java/org/gym/dao/DatabaseHelper.java