Controller, bomber och granater!
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/codename/core/src/main/java/se/rhel/view/WorldView.java
småtrixx