Eco beacon animation
Merge remote-tracking branch 'origin/master'

Conflicts:
	DBS-Game-Jam-Repo.userprefs