Improved grammar file and TreeController
Merge branch 'master' of github.com:ArjanO/AP-NLP