merged changes
added support for inserting snippets by shift+click
Merge remote-tracking branch 'upstream/master'
use shortName as fallback for some entries if no snippet
Merge remote-tracking branch 'upstream/master'
fixed undo manager to not remove all code
Merge pull request #1422 from dkundel/master

Fixed issue #1420 and pasting snippets on click