Phong modified
Merge branch 'master' of github.com:windylee/tz

Conflicts:
	application/controllers/message.php
	application/controllers/profile.php