added things I forgot to push
fixed merging error with models.py
Merge branch 'development' of https://github.com/ttsun/odetta into development