build boat tui
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestMVC/src/en/htwg/seapal/aview/tui/activity/WaypointActivity.java
	TestMVC/src/en/htwg/seapal/controller/impl/BoatController.java