pluralize helper
Merge branch 'master' of github.com:codebrowser/web-client

Conflicts:
	static/assets/js/codebrowser-min.js
	static/assets/js/codebrowser-templates-min.js