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

Conflicts:
	com.sg.vim.sync/src/com/sg/vim/sync/Sync.java