fix the version.
Merge branch 'master' of https://github.com/fzz727/jjw

Conflicts:
	Admin/Bin/model.pdb
	Web/Bin/model.pdb