Merge branch 'master' into development
Add check that project exists for projects controller
Fix merge conflicts from jim/development
Merge branch 'jim'