Merge branch 'master' of https://github.com/chenghan91/LepakOrderer-Vitesse

Conflicts:
	.idea/misc.xml
Merge branch 'master' of https://github.com/chenghan91/LepakOrderer-Vitesse