commit
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Prefab/Items/GenericItem.prefab
	ProjectSettings/TagManager.asset
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Prefab/Items/GenericItem.prefab
	ProjectSettings/TagManager.asset