Django update

Added new model for typeData
Merge remote-tracking branch 'origin/master'