Update #3
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/scenes/testMap.unity