Updated SDK to commit 7b9a7987b986d68ed222a25bf059b3dd49b8bf7a; Fixes #104, Fixes #109
Merge remote-tracking branch 'upstream/develop'

Conflicts:
	res/layout/activity_customize_product.xml