More resilient test for #1208
Update toolbar.rst

Removes extra characters that produce a syntax error.
Merge pull request #2047 from FinalAngel/feature/fixes

Further frontend fixes
Merge pull request #2054 from chrisfranklin/develop

Update toolbar.rst
Pass the page parameter to get_request when needed
Add page parameter to CMSTestCase.get_request
Merge pull request #2059 from yakky/feature/fixes_tests

Fix current_page parameter in tests
Merge pull request #2046 from yakky/feature/test_1208

More resilient test for #1208
Merge branch 'develop' of github.com:divio/django-cms into feature/fixes