iMac
Merge branch 'master' of https://github.com/diogo827/SugarCrm

Conflicts:
	Database/sugarcrm.sql