Zucka/girafAdmin — pull request #3 by Zucka (2013-06-03 11:52:01+00:00)
Title: Develop

Merged develop into master as report has been handed in