oops
Merge branch 'master' of github.com:vtmer/bookshelf

Conflicts:
	website/application/config/~database.php
Merge branch 'master' of github.com:vtmer/bookshelf
添加用户不存在情况