Feature/grammarv2bis

New try 
Merged with develop including travis fix and pass externalization.
Still doesn't pass lint build 
https://travis-ci.org/daydreaming-experiment/app/builds/28955509