Validation changes, currently errors with first name are the closest to final
Merge branch 'master' of https://github.com/gwillad/syllabest
Merge branch 'chris'
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
Merge branch 'chris'