User Profile Image Done
Contact Page Done
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/site/profile.php
Search Page Fix