avatar goodness
Merge remote-tracking branch 'origin/master'

Conflicts:
	public_html/1-0/controllers/User_Controller.php
back on track