Commit: merge
Merge remote-tracking branch 'origin/master' into master-joy

Conflicts:
	src/co/nextix/jardine/customers/AddCustomerFragment.java
Commmit: textview
Merge remote-tracking branch 'origin/master' into master-joy