Extended Grammer + Types
Merge branch 'master' of http://github.com/software-engineering-amsterdam/sea-of-ql