Update copy for initial partner saved searches [MJ-779]
Condense images and descriptions into one column [MJ-750]
Prevent unicdoe from breaking csv exports [MJ-813]
Test for encoding on exports [MJ-813]
Make prm@my.jobs case insensitive [MJ-706]
Change test emails, remove try/except [MJ-706]
Fix tests, change if condition to correctly determine forwards [MJ-706]
Merge branch 'master' into prm-case-insensitive

Conflicts:
	mypartners/tests/views.py
Merge pull request #579 from DirectEmployers/saved-search-email-layout

Condense images and descriptions into one column [MJ-750]
Merge pull request #578 from DirectEmployers/update-initial-pss-copy

Update copy for initial partner saved searches [MJ-779]
Merge pull request #580 from DirectEmployers/encoding-handling

Encoding handling [MJ-813]
Merge pull request #583 from DirectEmployers/prm-case-insensitive

Make prm@my.jobs case insensitive [MJ-706]
Merge branch 'master' into company-user-admin

Conflicts:
	requirements.txt