Modified grammar for primitive types
Modified lexer that concerns primitive types
Merge branch 'master' of github.com:ArjanO/AP-NLP