modal styling
merge with master
remove temp uploads folder from cache
privacy policy added
deployment for joe to test
fixed conflicts