Merge branch 'master' into 15_09_2013
Merge branch 'Master' into Backend
Merge branch 'Master' into 15_09_2013
Hotfix
Merge branch 'Backend' into Frontend
Merge branch 'Backend' into 15_09_2013
Added Employees and Booking handling for animals
Merge branch 'Backend' into 15_09_2013
Merge branch '15_09_2013' into Frontend