added models and views
Merge branch 'develop' into staging