Merge branch 'develop' of bitbucket.org:bittner/django-organice into develop
Merge branch 'develop'