Java rockstar coding
Merge branch 'master' of https://github.com/WinToosa/mobilelogger.git

Conflicts:
	MobileLoggerServer/src/main/java/cs/wintoosa/domain/SessionLog.java