adapting to heroku
removing proxy
Merge branch 'release/1.6' into develop