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

Conflicts:
	viamarket/ViaMarketApp/src/com/Via/market/ItemDisplayList.java
	viamarket/ViaMarketApp/src/com/Via/market/SumUpItem.java
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java
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/SumUpItem.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/uploadNewItem$loadData.class
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java
Merge branch 'master' of https://github.com/foulo005/viamarket

Conflicts:
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java