Merge branch 'Backend' into Master
fe CSS
Merge branch '15_09_2013' into Master
CSS
Merge branch 'Backend' of https://github.com/vip3out/Feld24 into Backend

Conflicts:
	css/main.css
css
css
next deployment from 12.09.13
Margin fix, merging via FE Branch
Merge CSS from Frontend Branch
FE Ipad/Iphone
Merge branch 'Backend' of https://github.com/vip3out/Feld24 into Backend

Conflicts:
	config.php
	css/main.css
FE Main.css new
Deployment 01.10.2013
Merge remote-tracking branch 'origin/Frontend' into Backend

Conflicts:
	js/functions.js
	views/bookings/edit_date.php
	views/header.php
Merge branch 'Backend' of https://github.com/bjotwdya/Feld24 into Backend

Conflicts:
	config.php
	css/main.css
Merging complete
Deployment 02.10.2013
Updated Protection and remove dump
Deployment 06.10.13