update
Merge branch 'master' of https://github.com/techvn/hoteljob

Conflicts:
	protected/messages/vi/jobs.php