configuring to be deployed in heroku
Merge branch 'fr-0005'