Update syllabus_content in schema

updated syllabus_content to include N texts (complex element) and N themes
Update syllabus_content in template
fixed conflict in xsd file