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
Merge remote-tracking branch 'rosetta/master'
binaries
Merge remote-tracking branch 'rosetta/master'
Moved back to SqlCE
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
basket
Merge pull request #21 from rustyswayne/master

Moved back to SqlCE