Added company model
Finished all the views for the company model.
Added the activity boolen field to company model and added functionality for enabling,disabling and deleting companies.
Just a few minor tweaks.
Fix merge conflict
Merging company model
Minor bug fixes