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

Conflicts:
	viamarket/viamarket.v12.suo