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

Conflicts:
	viamarket/ViaMarketApp/AndroidManifest.xml
	viamarket/ViaMarketApp/bin/AndroidManifest.xml
	viamarket/ViaMarketApp/bin/ViaMarketApp.apk
	viamarket/ViaMarketApp/bin/classes.dex
	viamarket/ViaMarketApp/bin/classes/com/Via/market/CustomAdapter.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/ItemDisplayList.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/LoginActivity.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/MarketTimeLine.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/Profile.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$id.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$layout.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$menu.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$string.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$style.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$xml.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SearchActivity$categoryHttpRequest.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SignUp.class
	viamarket/ViaMarketApp/bin/resources.ap_
	viamarket/ViaMarketApp/gen/com/Via/market/R.java
	viamarket/ViaMarketApp/res/values/strings.xml
	viamarket/ViaMarketApp/src/com/Via/market/Item.java
	viamarket/ViaMarketApp/src/com/Via/market/SumUpItem.java
	viamarket/viamarket.v12.suo
	viamarket/viamarket/App_Data/aspnet-viamarket-20140519111216.mdf
	viamarket/viamarket/App_Data/aspnet-viamarket-20140519111216_log.ldf
	viamarket/viamarket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
 update android
mergeMerge branch 'master' of https://github.com/foulo005/viamarket

Conflicts:
	viamarket/ViaMarketApp/AndroidManifest.xml
	viamarket/ViaMarketApp/src/com/Via/market/ChoosePictures.java
	viamarket/ViaMarketApp/src/com/Via/market/JSONParser.java
	viamarket/ViaMarketApp/src/com/Via/market/SumUpItem.java
	viamarket/ViaMarketApp/src/com/Via/market/uploadNewItem.java
	viamarket/viamarket.v12.suo
	viamarket/viamarket/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache