fixed grammar for CQ5 support + tests
Merge branch 'master' of github.com:evra/cnd-editor