Signed-off-by: caiz <fjcaiz007@sina.com>
Merge branch 'master' of ssh://git@github.com/hongdong/taupst_server.git

Conflicts:
	src/com/taupst/model/User.java
	src/com/taupst/util/JdbcUtils.java