read .vm from git and bump version
support s.dianping
resolve conflict
Merge pull request #267 from marsqing/master

read .vm from git