Merge branch '10_07_2013'
Merge branch '10_07_2013'
Merge branch '10_07_2013'
Merge branch 'Frontend' into 10_07_2013
Merge branch '10_07_2013' into Backend
Redeclare Config
Merge branch 'Frontend' into 10_07_2013
Merge branch 'Frontend' into 10_07_2013
Merge branch '10_07_2013' into Backend
Create a new Framework for Feld24

Please Contact Admin
Merge branch '15_09_2013'
Merge branch 'master' into Frontend

Conflicts:
	be/class/class_site.php
	config.php
	fe/tmpl/assets/temp_assets.php