update dbconf
	modified:   login.clj
fix dbutil/readme
Fixing conflict