Merge branch 'develop' of github.com:/dot42/api into develop