Merged...
Merge branch 'master' of https://github.com/anderssewerinhi/2dcloud.git

Conflicts:
	src/main/java/demo/simpleapplication/WordsWorld.java
Merge branch 'master' of https://github.com/anderssewerinhi/2dcloud.git

Conflicts:
	src/main/java/demo/simpleapplication/WordsWorld.java