Fix layout bug and also customer type is null bug
Merge branch 'master' into contacts-integration

Conflicts:
	res/layout/contactrow.xml