Fixed the prefabs now? Maybe?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Tiled2Unity/Prefabs/MALevel1.prefab.meta