synching shared
Merge branch 'master' of github.com:inboundnow/leads

Conflicts:
	shared/classes/class.form.php