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

Conflicts:
	viamarket/ViaMarketApp/AndroidManifest.xml
	viamarket/ViaMarketApp/bin/AndroidManifest.xml
	viamarket/ViaMarketApp/res/layout/activity_profile.xml
update android