code conventions example
Merge branch '3.3-corylus' of git@github.com:bedita/bedita.git into 3.3-corylus
#420 remove old 'author' record from object_types if present
#463 use ckeditor plugin for preventing bug
Merge branch '3.3-corylus'