Merge branch 'master' of https://github.com/wbprice/open-health-inspection-app into wbprice-master

Conflicts:
	index.html
	js/app.js
	js/controllers.js
	js/production.js
	js/production.min.js