cys
Merge branch 'master' of https://github.com/newideas07/IndoorAttribute

Conflicts:
	IndoorAttribute.suo
	IndoorAttribute/obj/x86/Debug/IndoorAttribute.csproj.GenerateResource.Cache