Update setup.py to require django-mptt==0.6 for python 3 support
Relax django-mptt specs to allow django-mptt==0.5.2
seems to me like database setup has nothing to do with templates, probably an error in the hierarchical levvel setting - fixing this by setting some of the parts one level up
adjust markup
Merge pull request #2287 from yakky/feature/fix_mptt_version

Update setup.py to require django-mptt==0.6 for python 3 support
Merge pull request #2289 from henning/bugfix/doc-structure-correction

fix for issue #2288
Fixed typo from 'labes' to 'labels'
Fixed another typo where 'labels' should be instead of 'labes'
Fixed final occurrence of 'labes' in CMS code
Merge pull request #2290 from ArtisAvotins/develop

Fixed a typo in both documentation and code. The word 'labes' is used instead of 'labels'
Initial commit for circleCI tests
Merge pull request #2304 from Chive/feature/circleci

Initial commit for circleCI tests
removed circle.yml file again since they don't support matrix builds
Merge pull request #2305 from Chive/develop

removed circle.yml file again since they don't support matrix builds
Merge branch 'develop' into local-develop
Fixed keyword error in respective method for editing content