1.0
Merge branch 'paomian' into development

Conflicts:
	.gitignore
	src/clojure_china/dbutil/userdbutil.clj
	src/clojure_china/pages/htmlutil.clj
	src/clojure_china/pages/login.clj
change table name
fix some bugs