started working on catalog activity
cleaning up a bit
added product activity not working
added product activity, working
Merge branch 'issu'

Conflicts:
	Kites-Yasmin/AndroidManifest.xml
	Kites-Yasmin/bin/AndroidManifest.xml
	Kites-Yasmin/bin/Kites-Yasmin.apk
	Kites-Yasmin/bin/classes.dex
	Kites-Yasmin/bin/resources.ap_
	Kites-Yasmin/res/layout/activity_catalog.xml
	Kites-Yasmin/res/layout/item_product.xml
	Kites-Yasmin/res/values/strings.xml
	Kites-Yasmin/src/com/asterphoenix/kites/yasmin/api/CatalogAPI.java
	Kites-Yasmin/src/com/asterphoenix/kites/yasmin/catalog/CatalogActivity.java
	Kites-Yasmin/src/com/asterphoenix/kites/yasmin/catalog/ProductActivity.java
	Kites-Yasmin/src/com/asterphoenix/kites/yasmin/catalog/ProductAdapter.java
bin
recovered from merge, everything working fine