Working example of make an enquiry
continued work on enquiry
Removed code kit conflict file
Merge branch 'master' of https://github.com/rjhaggart/uod

Conflicts:
	media/dundeewebsite/newhope/js/app/enquiry.js
	media/dundeewebsite/newhope/js/app/enquiry.min.js
	media/dundeewebsite/newhope/js/mustache/enquiry-questions.json