end turn confirm upd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Vectrosity.meta