Feedback
Merge branch 'master' of https://github.com/BLITZSOL/JEWELLERY

Conflicts:
	.gitignore
	THSMVC.suo
	THSMVC/Models/DataStore.edmx
	THSMVC/Models/StoneModel.cs
	THSMVC/Web.config
	THSMVC/bin/THSMVC.dll
	THSMVC/bin/THSMVC.pdb
	THSMVC/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	THSMVC/obj/Debug/THSMVC.dll
	THSMVC/obj/Debug/THSMVC.pdb
	THSMVC/obj/Debug/TempPE/Models.DataStore.Designer.cs.dll