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
HashMap fun.
NEw graphics
Remove useless array.
Remove testing stuff.
Merge new result handling from master to newsocketlib.
Another attempt.
Merge branch 'master' of https://github.com/tomiharju/laiva_android.git

Conflicts:
	Battleships-android/src/com/sohvastudios/battleships/core/SocketHandler.java
Merge branch 'master' of https://github.com/tomiharju/laiva_android
Merge new assets from master to newsocketlib.