Some changes to prefabs
Merge branch 'master' of https://github.com/browserscratch/GunRunner

Conflicts:
	Assets/Prefabs/Characters/flyer.prefab