commiting attempts to block the events
Merge pull request #703 from protherj/prop-editor-templates

commiting attempts to block the events
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0