Added new common content node type for BZ#1065609 - RFE: Need a way to specify the location of common content
Fixed an issue that was causing some strings to appear as untranslated.
Merge branch 'master' into devel

Conflicts:
	pom.xml