fix ckeditor js include if not already added
fix menu builder to use recursive iterator and matcher classes
Merge branch 'master' into 2.3