updating unicorn conf to not timeout
Merge branch 'hotfix/V1.2.1'
Merge tag 'V1.2.1' into develop

Correcting unicorn timeout