Cleanup, bugfixes etc
Merge branch 'master' of https://github.com/Quetzi/Morpheus

Conflicts:
	src/net/quetzi/morpheus/SleepChecker.java