background commit
Merge branch 'contacts-integration'
front-end fix bug
Merge branch 'master' into contacts-integration

Conflicts:
	res/layout/fragment_contact_details.xml
	src/com/ngy/nissan/db/CustomerDataSource.java
	src/com/ngy/nissan/db/DbHelper.java
no message
latest merge with ganyew's code
check in missing
string.xml
commit
Merge branch 'contacts-integration' of 192.168.0.3:tan-chong/sa into contacts-integration
datacontentprovider reverse
remove contactType dropdown
Merge branch 'master' into contacts-integration

Conflicts:
	src/com/ngy/nissan/domain/ContactInfo.java
	src/com/ngy/nissan/domain/Note.java
some final fixes in gy codes
all small fixes before release 1