Still trying to merge with master
Merge branch 'cms_install'

Conflicts:
	project_name/project_name/settings/base.py