localization updates, other small fixes from latest 1.2
quick style fix from localization changes
Merge pull request #20 from protherj/pre-cg-fixes

Pre cg fixes
Merge remote-tracking branch 'rosetta/master'

Conflicts:
	src/website/bin/Merchello.Core.dll
	src/website/bin/Merchello.Examine.dll
	src/website/bin/Merchello.Web.dll