Merge branches 'master' and 'chris'
remove singular syllabus controller again
Merge branches 'master' and 'chris'
Merge branch 'master' of https://github.com/gwillad/syllabest
added a show view for syllabuses