add classes after conflicts
Merge remote-tracking branch 'origin/KnockoutMadness' into Validation