Zucka/girafAdmin — pull request #2 by zfire (2013-04-08 07:17:12+00:00)
Title: Merge develop into master

End of Sprint 2