Working on proposal functionality
Working on proposal functionality - forgot revised notes image alertnative
Merge branch 'master' of github.com:encorelab/CommonKnowledge

Merging Matts changes with bug fixes with my current code.