Fixed company propterties and added reminder controller
Cleaned up in the code
Fix
Merge branch 'master' into alexbranch
Merge branch 'alexbranch'