用户资料修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/user/_form.php
	application/views/user/edit.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
main.css