update
update
Merge branch 'master' of https://github.com/linchg/wangpan

Conflicts:
	application/config/database.php
update
model user