first selenium test
Merge branch 'develop' of github.com:divio/django-cms into selenium
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
place templates in global folder
fixes jquery implementation
use tabs instead of spaces
Merge pull request #1849 from FinalAngel/develop

Frontend Fixes
configuration docs mainly
amended inherit template option text in English
contribution guide amended
Updated frontend tests to account for toolbar classes name change
Modified requirements and configuration for selenium tests to run on travis