fixing issues related to testing version 2.
Merge branch 'master' of https://github.com/getshop/applications