- Demo Version
  - Changed the way location model is written to disk
  - A bunch of other stuff.
Merge remote-tracking branch 'origin/master'