Fix for suggested answer editing form
Merge branch 'master' of https://github.com/DigitalCurationCentre/DMPonline_v4

Conflicts:
	app/assets/javascripts/admin.js