custom field cleanup
Merge branch 'develop' of https://github.com/nakautot/dirtyEd into develop

Conflicts:
	routes/custom_fields.js
	server.js