dev
merge branch dev
pep8
Merge branch 'master' of https://github.com/ChillyBwoy/django-plugshop