Updated SDK to commit 3ca092e0c8ad6745b5ffc51d4171a22d52e94841
Updated SDK to commit 604fbff516c830dd8eca1fb738cdd4a314f57f44
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/layout/activity_customize_product.xml
	res/layout/button_shopping_cart.xml
	res/values/colors.xml
	res/values/strings.xml