added highlight for __TRAIT__
Update against PHP 5.6.3-1.
Merge remote-tracking branch 'ruchee/master'