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

Conflicts:
	IndoorAttribute.suo