premerge
Merge branch 'master' of https://github.com/lilisun/pentimento
embedding functionality using iframes
embedding mode using iframes, fixed arrow key panning
Merge branch 'master' of https://github.com/lilisun/pentimento