Merge branch 'heroku' into my_wiris
WIRIS editor in frame
Merge branch 'my_wiris' into heroku