Merge branch 'master' of /opt/lampp/htdocs/nd.karlsruhe.dhbw.wwi12b3 with conflicts.
Merge remote-tracking branch 'origin/master'
routung modified
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/ActionsController.php
routung modified
Merge remote-tracking branch 'origin/master'