Merge branch 'master' into Backend
reverting htaccess
Merge branch 'Backend' into 15_09_2013
Merge branch '15_09_2013'
Merge branch 'master' into Frontend
Set new Custom View for FE Tests
Merge branch 'Backend' into 15_09_2013
Merge branch '15_09_2013'
Merge branch 'master' into Frontend
delete unused constants
Merge branch 'Backend' into 15_09_2013
Merge branch '15_09_2013' into Frontend
Merge branch '15_09_2013'
Merge branch 'master' into Frontend
Add Employee Handling
Merge branch 'Master' into Frontend

Conflicts:
	config.php