Show custom fields
Merge branch 'develop' of https://github.com/nakautot/dirtyEd into develop

Conflicts:
	public/js/views/custfield.js