move project location on server
Merge branch 'master' into theme/ultraclean

Conflicts:
	templates/base.html