New ignore file, try to fix prefab problem
Merge remote-tracking branch 'origin/master'