updated style of account settings from FAQ [MJ-933]
Improve finding of company_id
Improve memoization comment
Re-add analytics to dashboard [MJ-902]
Add HTTP referer to redirect docs [MJ-902]
Add microsite faceting [MJ-902]
Add filtering by microsite [MJ-902]
Fix tests, faceting should work [MJ-902]
Merge branch 'master' into dashboard-reimplementation
PEP 8, remove template comment [MJ-902]
Merge pull request #705 from DirectEmployers/apply-faq-style

updated style of account settings from FAQ [MJ-933]
Merge branch 'master' into dashboard-reimplementation

Conflicts:
	static/my.jobs.153-05.css
	static/my.jobs.153-12.css
	static/my.jobs.153-17.css
	templates/base.html
Remove blank line from css
Fix failing test
Use or instead of any() [MJ-934]
Merge pull request #706 from DirectEmployers/multiple-companies

Improve finding of company_id [MJ-934]
Merge pull request #707 from DirectEmployers/dashboard-reimplementation

Dashboard reimplementation [MJ-902]
Added UI for allowing a product to have an unlimited number of jobs [RM-122]
Merge pull request #711 from DirectEmployers/unlimited-jobs

Unlimited jobs [RM-122]
merged with master