duplicates issue "fix" rolled back
updated Catalan localization
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/ca.xml