Merge origin/master

Conflicts:
	src/com/ma/schiffeversenken/controller/Bluetooth.java
	src/com/ma/schiffeversenken/controller/Game.java
	src/com/ma/schiffeversenken/controller/ShipPlacement.java
	src/com/ma/schiffeversenken/view/Main.java