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
test one
bug
add login-page
fix bugs
do some change
1.0
	modified:   user_action.clj
add Modal
edit readme.md
edit readme.md
edit readme.md
change dbutil/readme and fix some bug
fix userdbutil.clj update-user-lastlogintime