Added GlobalSettings to use Guice to inject the controllers in Play
Merge branch 'master' of https://github.com/woehrl01/de.htwg.seapal.maps

Conflicts:
	app/de/htwg/seapal/maps/app/MapsMain.java
fixed conflicts / errors