Textures
Merge branch 'master' of https://github.com/tomiharju/laiva_android.git

Conflicts:
	Battleships-android/src/com/sohvastudios/battleships/core/LobbyActivity.java
	Battleships-android/src/com/sohvastudios/battleships/core/SocketHandler.java
NEw graphics
Merge branch 'master' of https://github.com/tomiharju/laiva_android.git

Conflicts:
	Battleships-android/src/com/sohvastudios/battleships/core/SocketHandler.java