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

Conflicts:
	THSMVC.suo