Added all models and according views
fixed merges
Merge branch 'master' of github.com:hemanthmraju/ubiquity