some name changes, configurations, EBean
ignore .project
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/de/htwg/seapal/boat/app/AppImplModule.java
	app/de/htwg/seapal/boat/app/AppMockModule.java