add core
Merge branch 'dev' of https://github.com/phamminhtuan/clickshop into dev

Conflicts:
	Document/~$$Database-V.1.00.~vsd