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

Conflicts:
	index.php
	public/css/styles.css
	public/js/manage_advocate.js