Fix for heroku
Heroku fixes
Merge branch 'my_wiris' into heroku
Merge branch 'heroku' into dev