some data fix, some pngs
merging from beta?
Merge branch 'master' of https://github.com/davzhou/Battleship

Conflicts:
	Battleship/src/com/me/battleship/Torpedo.java
conflict