Clean up respository prior to pulling Josh's code.
Merge remote-tracking branch 'origin/master' into merge/josh-changes

Conflicts:
	DNAOrderApp/order/templates/order/base_template.html
	DNAOrderApp/order/templates/order/fmprojectlist.html
	DNAOrderApp/order/templates/order/project-list-origin.html
	DNAOrderApp/order/templates/order/test_template.html