Adding logging
Merge branch 'master' of https://github.com/jhbertra/autoMATE_server.git

Conflicts:
	autoMATE_server/.classpath
	autoMATE_server/src/com/automate/server/database/DatabaseManager.java