test 3
Merge branch 'master' of https://github.com/GeniusReferrals/GRJavascriptSandbox

Conflicts:
	public/js/advocate_actions.js