Fixed comments embedded in .erb files to use the correct syntax,
<%-# ... -%>
so they do not show up in the rendered forms.
Merge branch 'production' of https://github.com/expertiza/expertiza

Conflicts:
	app/views/survey_deployment/list.html.erb