cleaning up tests
fix merge conflicts
minor ui changes
Merge branch 'master' of github.com:kateflood/garden-exchange
fix disabled text field issue
Merge branch 'master' of github.com:kateflood/garden-exchange
Merge branch 'master' of github.com:kateflood/garden-exchange
item edit state fix
Merge branch 'master' of github.com:kateflood/garden-exchange
Merge branch 'master' of github.com:kateflood/garden-exchange
fixing asset pipeline issue