added new tiles
fixed crash issues
Merge branch 'Kmae' into Networking