Updated touch scaling
Updated tile map
Merge remote-tracking branch 'origin/master'