Merge branch 'solr' of https://github.com/DirectEmployers/MyJobs
Merge branch 'master' of https://github.com/DirectEmployers/MyJobs
Merge branch 'master' of https://github.com/DirectEmployers/MyJobs
Merge branch 'prm-communication' of https://github.com/DirectEmployers/MyJobs
Added comments and small refactoring to make additions easier [MJ-706]
Initial changes to partner/contact models and basic contact record creation
Fixed fallout from model changes
Fixed contact edit page and contact type drop down list
Less broad except
Remove partner from contact edit/creation form
Merge + changes from merge
Revert "Merge + changes from merge"

This reverts commit cbfeddf8983c180d5a719d05f012897592fcfc52.
Merge branch 'master' of github.com:DirectEmployers/MyJobs into email

Conflicts:
	mypartners/tests/views.py
	mypartners/views.py
	mysearches/forms.py
Fixed tests
Merge pull request #523 from DirectEmployers/email

Create contact record for partner saved search email
Fixed mistake in partner creation
Merge pull request #525 from DirectEmployers/fix

Fixed mistake in partner creation
Merge branch 'master' of https://github.com/DirectEmployers/MyJobs
Added error page to static files.
Merge pull request #527 from DirectEmployers/static-error-page

Static error page MJ-694