Merge branch 'master' into develop
NF: Can't get django-shop to play nice with Django 1.7 (only officially supports 1.5, not documented), uninstalling
Merge branch 'develop'