Merge branch 'master' into quadtree

Conflicts:
	src/assault/display/Paintable.java
Merge branch 'master' of github.com:golvok/Assault

Conflicts:
	src/assault/display/Paintable.java