Prevent profile items from being hidden upon edit [MJ-248]
Merge branch 'master' into profile-edit-hides-item__MJ-248

Conflicts:
	templates/includes/form-error-highlight.html
Merge pull request #140 from DirectEmployers/profile-edit-hides-item__MJ-248

Prevent profile items from being hidden upon edit [MJ-248]