fix panel height on editor resize
increment version number
Merge pull request #30 from redmunds/fix-resize

Fix panel height on editor resize
fix merge conflict