Tweaking and bug fixing.
Merge branch 'master' of https://github.com/theagentd/WeShallWake.git

Conflicts:
	WSW/src/game/core/Core.java
Merge branch 'master' of https://github.com/theagentd/WeShallWake.git