Merge branch 'master' into development

Merging changes made on the master branch.
added pytest
changed tests package to pytest-django
Changed the url to the production site.