More changing of absolute paths
Merge branch 'master' of http://github.com/tekton/DocuCanvas

Conflicts:
	templates/food/food_overview.html
	templates/projects/project_form.html
Merge branch 'master' of http://github.com/tekton/DocuCanvas