Merge origin/master

Conflicts:
	Battleship/src/battleship/Battleship.java