Controllers and views
Merge remote-tracking branch 'origin/master' into dev001
Code changes after merge
Fixing namesspaces in web.config
Fixed time property throwing an error
Merge branch 'master' of https://bitbucket.org/theunemployed/contractormate