change code to show data
Merge branch 'master' of https://github.com/thanhtuyen/vaco

Conflicts:
	protected/controllers/admin/NewsController.php
edit user