Merge branch 'master' into documents

Conflicts:
	syte/compress.py
	syte/static/js/components/links.js
	syte/static/less/profiles.less
	syte/syte_settings.py
	syte/templates/base.html
	syte/urls.py
Merge branch 'master' into documents
Merge branch 'documents' into eventh

Conflicts:
	syte/compress.py
	syte/static/js/components/links.js
	syte/static/less/profiles.less
	syte/syte_settings.py
	syte/templates/base.html
	syte/urls.py