some change
Merge branch 'development' of github.com:paomian/clojure-china into development

Conflicts:
	src/clojure_china/dbutil/userdbutil.clj
	src/clojure_china/pages/htmlutil.clj
	src/clojure_china/pages/login.clj
	modified:   .gitignore
change
	modified:   .gitignore
do some change
fix some code
Merge branch 'development' of github.com:paomian/clojure-china into development

Conflicts:
	.gitignore