working on adding users and sessions
please ignore this one
fixing ordered_items issues to work with order json
resolved merge conflicts from delia's views and other corrections
added fields to items form
resolving merge conflicts from master
Merge pull request #19 from hjhartung/dev

Dev