closes #721 - add section modal shows error if adding fails
Merge branch 'master' into issue-813
Merge pull request #828 from mina/issue721

closes #721 - add section modal shows error if adding fails
Committing changes for issue 98 into a new branch.
Fix non-closed tags in fieldset.
fix #830
removed annotation hiding code
image annotations from categories working pending error messages
added error messages
adjust comments
added translations
added span tags to french yml file
added newline
update merge
Merge pull request #820 from ummu/812

Fix for #812 - replace url_for() with *_path()
Closes #812
Merge pull request #829 from Fudge21/new_issue_98

Issue 98 fix
Merge branch 'master' into image-annot

Conflicts:
	app/views/results/common/_annotations.js.erb
fix #648
Added tests for issue #648 fix
Merge pull request #832 from mina/648-period-val

Closes #648