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