bugfixes related to contacts system
Merge branch 'release/1.4' of github.com:openeyes/OpenEyes into release/1.4

Conflicts:
	protected/behaviors/ContactBehavior.php
	protected/models/ContactLocation.php