feld24
breadcrumb markup added
Merge branch 'Frontend' of https://github.com/vip3out/Feld24 into Frontend

Conflicts:
	fe/tmpl/assets/temp_assets.php
breadcrumb
Revert "breadcrumb"

This reverts commit edb50deaf347b32b1f242fdf64f4c770004991c2.
Revert "Merge branch 'Frontend' of https://github.com/vip3out/Feld24 into Frontend"

This reverts commit 2ffaaec729989a9b7aab7ca26fc16d990e1edcad, reversing
changes made to 93db23efc89de3d233d61c84f0dac12a8e266e81.
sinnlos
Merge branch 'master' into Frontend

Conflicts:
	be/class/class_site.php
	config.php
	fe/tmpl/assets/temp_assets.php
Merge branch 'master' into Frontend
Merge branch 'master' into Frontend
Merge branch '15_09_2013' into Frontend
Merge branch 'master' into Frontend
Merge branch 'Master' into Frontend

Conflicts:
	config.php
Merge branch 'Backend' into Frontend
fe CSS
Merge branch '15_09_2013' into Frontend
CSS
Merge branch 'Backend' of https://github.com/vip3out/Feld24 into Backend

Conflicts:
	css/main.css
css
css