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

Conflicts:
	viamarket/ViaMarketApp/bin/AndroidManifest.xml
	viamarket/ViaMarketApp/src/com/Via/market/ItemDisplayList.java
	viamarket/ViaMarketApp/src/com/Via/market/SumUpItem.java
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java