small changes
Merge branch 'javascrip-fixes'

Conflicts:
	app/views/dmptemplates/_edit_version.html.erb
	app/views/dmptemplates/_show_template.html.erb
merge fix