TypeChecker and Grammar rewrite

Changed grammar to include all types
Implemented Typechecker for all clear cases where boolean or number types are expected exclusively
Merge branch 'master' of https://github.com/software-engineering-amsterdam/sea-of-ql into bartolkaruza-fb