fixes
Merge branch 'develop' of github.com:Zucka/girafAdmin