updated models
pyc stuff
pyc stuff
bugfix
merging with webdev