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
Merge branch 'develop'
fixes #3020, again: language_fallback enabled placeholder can screw things up
fixes #3020, again: language_fallback enabled placeholder can screw things up
Merge pull request #3036 from benzkji/fix-3020

In edge cases, language_fallback in placeholder conf can make other plugins disappear.