blabla
gergmergee branch 'master' of https://github.com/foulo005/viamarket

Conflicts:
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemAdapter.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList$TimeLineHttpRequest.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList.class
upload android