Merging changes from stage to master to test codeship.io project

So far codeship.io is the only CI as a Service which I was able to setup and have necessary features to facilitate multi-branch multi-environment heroku deployment. Next to it should be CircleCI but I personally found it more complicated to configure.