new site remodel
test passed and variable issues fixed
Merge branch 'master' of https://github.com/ilendl2/chrisdevsite-template

Conflicts:
	project_name/settings/base.py
	project_name/static/css/menu.css
	project_name/templates/flatpages/default.html
	project_name/templates/site_base.html
	requirements/_base.txt