add of Nicolas part, add an item, class for an item is alost done
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/MarketTimeLine.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/Profile.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/R$drawable.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/SearchActivity.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SignUp.class
	viamarket/ViaMarketApp/bin/dexedLibs/android-support-v4-35305152bde369dd2ec808e8f48ec5c1.jar
	viamarket/ViaMarketApp/bin/resources.ap_
	viamarket/ViaMarketApp/gen/com/Via/market/R.java
	viamarket/ViaMarketApp/src/com/Via/market/SearchActivity.java
merge
Merge 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/LoginActivity$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/LoginActivity.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/MarketTimeLine$1.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/MarketTimeLine$2.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$drawable.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.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SignUp.class
	viamarket/ViaMarketApp/bin/classes/com/Via/market/SplashScreen.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/MarketTimeLine.java