Merge branch 'master' of https://github.com/pglaz/shoppa

Conflicts:
index.php
Resolving index.php conflict