Merge branch 'master' of https://github.com/jmacgray/hctm

Conflicts:
	.gitignore
	src/nopCommerce/NopCommerce.v11.suo
	src/nopCommerce/Presentation/Nop.Web/App_Data/Settings.txt