Remove order from syllabus and child_id from components, add order to components
preserve conflict problems
Merge branch 'master' of https://github.com/gwillad/syllabest