Signed-off-by: ghuazh <ghuazh@gmail.com>
Merge branch 'master' of https://github.com/sgewuhan/vim.git

Conflicts:
	com.sg.vim.datamodel/src/com/sg/vim/datamodel/vidcservice/CertificateRequestService.java
	com.sg.vim/src/com/sg/vim/Vim.java

Signed-off-by: ghuazh <ghuazh@gmail.com>