分用户显示水印信息
修改显示数据
Merge branch 'master' of github.com:WangTe/duikang

Conflicts:
	application/controllers/home.php
	application/models/user_m.php