add state_machine, state column to assets, ability to select default image
Merge branch 'master' of https://github.com/eatmorespinach/ed_final