Modified logger output
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/src/ddpsc/database/snapshot/SnapshotDaoImpl.java
Merge remote-tracking branch 'origin/master'