Merge branch 'master' of https://github.com/emag/morecat-production
Merge branch 'master' of https://github.com/emag/morecat-production
Add proxy settings