highlighting improvement
Merge remote-tracking branch 'origin/vaadin7' into vaadin7