Undoing some generics
Parser modified because of the redo
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql
Merge branch 'master' into martyn82