first selenium test
Merge branch 'develop' of github.com:divio/django-cms into selenium
stacks initial
Merge remote-tracking branch 'origin/pr/1749' into feature/stacks
Merge branch 'develop' into feature/stacks
frontend integration for stacks
Merge pull request #1830 from piquadrat/feature/stacks

Stacks
Merge pull request #1837 from FinalAngel/develop

only display parent entries
3.0.0.beta
started work on docs
Merge branch 'develop' into selenium

Conflicts:
	cms/tests/__init__.py
further docs improvements
upgrade docs merged
Merge pull request #1842 from evildmp/docs3

Release notes docs minor rewrites
Merge pull request #1673 from ojii/selenium

Selenium tests
Merge branch 'develop' of github.com:divio/django-cms into develop
show page toolbar on pages that have apphooks as well
fixes block issues on paragraphs