fixed heroku deployment problem
Merge branch 'wysiwyg'