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

Conflicts:
	viamarket/viamarket/VIAMarketApp/AndroidManifest.xml
	viamarket/viamarket/VIAMarketApp/bin/AndroidManifest.xml
	viamarket/viamarket/VIAMarketApp/gen/com/Via/market/R.java
	viamarket/viamarket/VIAMarketApp/res/layout/activity_splash_screen.xml
	viamarket/viamarket/VIAMarketApp/res/values/strings.xml
	viamarket/viamarket/VIAMarketApp/src/com/Via/market/LoginActivity.java
	viamarket/viamarket/VIAMarketApp/src/com/Via/market/SplashScreen.java
android update
Merge branch 'master' of https://github.com/foulo005/viamarket