connect Menu and content
Was zur Hölle macht der public Ordner im conf Ordner ??? !?!?! ?!?!?!?
Merge branch 'master' of https://github.com/Project-Phoenix/Website

Conflicts:
	app/controllers/Application.java