model update
v2
v3
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroSot/bin/x86/Debug/AndroSot.exe
	AndroSot/bin/x86/Debug/AndroSot.pdb
	AndroSot/obj/x86/Debug/AndroSot.csproj.FileListAbsolute.txt
	AndroSot/obj/x86/Debug/AndroSot.csproj.GenerateResource.Cache
	AndroSot/obj/x86/Debug/AndroSot.exe
	AndroSot/obj/x86/Debug/AndroSot.pdb
	AndroSot/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache