test release candidate
Merge branch 'release-candidate-1'

Conflicts:
	client/views/opportunities/opportunity_page.js