changed createContent.ftl with fieldMacro
Merge remote-tracking branch 'origin/Develop' into Develop
fixed an error in CourseSearchFilter (filtration by types):
changed table name coursetypes into CourseTypes