Merge branch 'master' of github.com:ingood/vcms

Conflicts:
	.gitignore
del install
Merge branch 'master' of github.com:ingood/vcms