Merge pull request #175 from corliss/dev3

Context menu and toolbar changes.
Comment out InvalidOperationException (is there anything to implement here)?
Merge remote-tracking branch 'picoe/develop' into dev3