Merge branch 'master' into prod

requirements.txt

@@ -4,7 +4,7 @@ botocore==1.12.86
 certifi==2018.11.29
 chardet==3.0.4
 defusedxml==0.5.0
-Django==2.1.5
+Django==2.2
 django-cleanup==0.4.2
 django-stdimage==2.4.1
 django-storages==1.5.2
@@ -15,8 +15,7 @@ jmespath==0.9.3
 oauthlib==3.0.1
 olefile==0.44
 packaging==16.8
-Pillow==4.0.0
-pkg-resources==0.0.0
+Pillow==6.0.0
 progressbar2==3.12.0
 psycopg2-binary==2.7.5
 PyJWT==1.7.1
@@ -33,5 +32,6 @@ s3transfer==0.1.13
 six==1.12.0
 social-auth-app-django==3.1.0
 social-auth-core==3.0.0
+sqlparse==0.3.0
 urllib3==1.24.1
 whitenoise==3.3.0