Merge pull request #1 from Zucka/develop

Develop
Merge pull request #2 from Zucka/develop

Merge develop into master
Minutes from our Counsler
Flags
Merge branch 'master' of github.com:Zucka/girafAdmin
Merge branch 'develop' of github.com:Zucka/girafAdmin
LINUX COMPATABILITY