Merge branch 'master' of github.com:BeshoyLouka/Zincify into develop
Merge branch 'develop' of github.com:BeshoyLouka/Zincify into develop