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

Conflicts:
	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