working on project updates and fixing merge conflict where view_opportunity code was lost
Merge branch 'master' of github.com:reallocate/reallocate