Merge branch 'release/fisrt_usable'
Merge branch 'develop'
adapt to heroku