MAJ Tips and co
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefab/GameManagers.prefab