sidekicked
typos
update gmefile
Merge branch 'models' into dev