Add custom form fields to CompanyUser admin [MJ-812]
Fix issue with new admin [MJ-812]
Merge branch 'master' into company-user-admin

Conflicts:
	requirements.txt
Give search location and query their own fields [MS-969]

Make failing test pass
moved all js to bottom of body
changed names of static files that will be changing regularly. got rid of cache_buster
Merge pull request #587 from DirectEmployers/analytics-solr-fix

Give search location and query their own fields [MS-969]
Merge pull request #586 from DirectEmployers/company-user-admin

Add autocompletes to CompanyUser admin [MJ-812]
Merge pull request #588 from DirectEmployers/static-files

Static Files to the Cloud
url change on production
Merge pull request #591 from DirectEmployers/static-file-fix

url change on production
url for images pointing to cloudfront countryselect fix
Merge pull request #592 from DirectEmployers/static-file-fix

url for images pointing to cloudfront countryselect fix
Merge branch 'master' into jenkins

Conflicts:
	default_settings.py