update android
Merge branch 'master' of https://github.com/foulo005/viamarket

Conflicts:
	viamarket/ViaMarketApp/bin/ViaMarketApp.apk
	viamarket/ViaMarketApp/bin/classes.dex
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SearchActivity$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SearchActivity$categoryHttpRequest.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SearchActivity.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem$2.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem$3.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem$loadData.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem.class
	viamarket/ViaMarketApp/bin/resources.ap_
	viamarket/ViaMarketApp/src/com/Via/market/SearchActivity.java
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java
update