Added tox support for running tests with pytest-django.
Disabled test resize images action.
Merge remote-tracking branch 'origin/master_pbs' into LUN-1033

Conflicts:
	test_settings.py