Maven + MySQL project
cleaning
Merge remote-tracking branch 'origin/master'

Conflicts:
	demail/src/main/java/edu/tsystems/demail/HelloWorldController.java