velocity and turning
Merge branch 'master' of github.com:castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/assets/Interface/MainMenu.xml
	NavalBattleSim/src/gui/GUIController.java
Merge branch 'master' of github.com:castoridae/naval-battle-sim

Conflicts:
	NavalBattleSim/src/scenario/Scenario.java