Many Changes
Merge branch 'master' of https://github.com/sabradesign/USC-Reality-V1.2

Conflicts:
	admin/deals-template.php