Adding django model to this
Merge branch 'master' of https://github.com/comtesacristain/nopims