Merge branch 'dev' of C:\IDEA Projects\Submarines with conflicts.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/com/DummyMentat/Submarines/Graphics/Graphics.java
No-dpi textures support, new atlas image