modify UI(pinkcolor)
Merge remote-tracking branch 'origin/UIearth'

Conflicts:
	androidpos/res/layout/activity_product_catalog.xml