test 5
Merge branch 'master' of https://github.com/GeniusReferrals/GRPHPSandbox

Conflicts:
	ajax/manage_advocate_ajax.php
	public/css/styles.css
	public/js/manage_advocate.js