Merge pull request #1 from arsood/development

Getting latest updates
Update db schema
Updating owner controller and forms
Fixing conflicts
Merge pull request #21 from asithade/development

Owner Controller