all them borders and collectables
Merge remote-tracking branch 'origin/master'

Conflicts:
	watermageGame/ProjectSettings/TagManager.asset