Commit good files!
Merge branch 'master' of https://github.com/IDCI-Consulting/ep_zotero

Conflicts:
	static/js/modals/form.js
	static/js/modals/help.js