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

Conflicts:
	viamarket/ViaMarketApp/bin/AndroidManifest.xml
	viamarket/ViaMarketApp/bin/ViaMarketApp.apk
	viamarket/ViaMarketApp/bin/classes.dex
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList$TimeLineHttpRequest$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList$TimeLineHttpRequest.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/LoginActivity$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$id.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ShowItemToSell.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SumUpItem.class
	viamarket/ViaMarketApp/bin/resources.ap_
	viamarket/ViaMarketApp/gen/com/Via/market/R.java
	viamarket/ViaMarketApp/src/com/Via/market/ItemDisplayList.java