Merge branch 'master' of https://github.com/BrandonJF/EAV_Support

Conflicts:
	app/views/actionItems.htm
	templates/ActionItemsdll/docs_JSON.json
This is a test push from Jenny's account