Add a Bitdeli badge to README
Merge pull request #2346 from bitdeli-chef/master

Add a Bitdeli Badge to README
Optimize page permissions checking

  * group__users doesn't exist and it wasn't select_related
  * group__user_set is a one to many, we should use prefetch_related
  * has_permission_membership was still running even if has_perm was
    True
Merge pull request #2756 from fusionbox/fix-menu-performance

Optimize page permission checking
Merge branch 'develop'

Conflicts:
	README.rst
	cms/menu.py
Merge branch 'develop'

Conflicts:
	README.rst
bugfix: escape js string in a template
typo
Merge pull request #3007 from mkoistinen/doc_fix

typo
Fix #3008, enable clear button on new redirect field
Refresh page on template change.
Merge pull request #3011 from johnraz/develop

Fix #3008, enable clear button on new redirect field
Merge pull request #3012 from yakky/feature/fix_3009

Refresh page on template change.
Merge pull request #3005 from ollb/bugfix/escapejs_page_tree_base_html

bugfix: escape js string in a template
fixes issue #3003
Merge pull request #3014 from FinalAngel/develop

fixes issue #3003
fix an issue with saving collapsable states
Merge pull request #3016 from FinalAngel/develop

fix an issue with saving collapsable states
fixes #3017
no fallback if in edit mode for placeholders