updated models and admin interface
Merge pull request #42 from drew212/modelupdate

updated models and admin interface