merge strings
Merge branch 'master' of https://github.com/jspenc45/CMC.git

Conflicts:
	CubicMeterCommunityApp/res/values/strings.xml