fixing bugs
adapting to heroku
Merge branch 'release/1.19' into develop