Add sublists to Views:
Contacts to Customers
Contacts and Customers to Organization
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/views/customer/_contact.php
	protected/views/organization/_contact.php
	protected/views/organization/_customer.php