updated lexer, some parser stuffs
Merge branch 'master' of github.com:cptaffe/basilisk-v2