Model query tweaks.
Merge branch 'develop' of github.com:kasperisager/bookie into develop

* 'develop' of github.com:kasperisager/bookie:
  Add join example to grammar.java.