CodePro fixes on toolbar files

Author: lhunker
Merge remote-tracking branch 'origin/team9dev' into codePro
Merge remote-tracking branch 'origin/team9dev' into codePro
CodePro fixes for view and notifications packeges

Author; lhunker
Moar code pro fixes

Author: lhunker
CodePro fixes on model and notification packedges

Author: lhunker
Merge pull request #101 from dbeckwith/codePro

Moar Code pro