Merge remote-tracking branch 'origin/develop' into tests-cleanup
Merge remote-tracking branch 'yakky/feature/test_migrations' into tests-cleanup
Fixes jsTree's relative URL construction for theme components

Calculates the path component of the URL used to load cms.changelist.js
and sets jsTree's settings.ui.theme_path relative to that.
Fix whitespace, remove '?' from script selector.

The '?' which was removed would cause the selector to only find the
<script> tag if cms.changelist.js had been specified with a query
string following it.
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
restrict form submit prevent to cms_toolbar namespace
Merge branch 'develop' of github.com:divio/django-cms into develop
added compiled css
structure view styling improvements