Merge branch 'develop' into release/1.2.0
Merge branch 'release/1.2.0'
Merge branch 'master' into develop
Merge branch 'develop' of github.com:CakeDC/categories into develop
Merge pull request #18 from burzum/develop

Develop