Better token filtering in LayeredParser (for native xml problem in SCL-5162 {Play 2 Scala Template: Some false positive errors} )
(cherry picked from commit 8c751fc)
Merge remote-tracking branch 'origin/IDEA13' into IDEA13