Deployment 01.10.2013
Merge branch 'Backend' of https://github.com/bjotwdya/Feld24 into Backend

Conflicts:
	config.php
	css/main.css