core updates
Merge branch 'master' of https://github.com/rustyswayne/RosettaStone

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