comment
Merge branch 'dev'
Merge remote-tracking branch 'origin'

Conflicts:
	protected/controllers/TrController.php