Fixes counter display for .repeatableFrom in Firefox.
Fixes permission check almost always failing when presenting the publish button.
Conflicts:
	tool-ui/src/main/webapp/content/edit.jsp
Merge branch 'release/2.1'

Conflicts:
	tool-ui/src/main/webapp/content/edit.jsp