Update maps/conference_floor_one.tmx

Collision reference.
Update maps/conference_floor_two.tmx

Collision reference.
Update maps/conference_room.tmx

Collision reference.
Update maps/chishiki_no_sabaku.tmx

Fix collision.
Merge pull request #12 from PyroSamurai/master

Map Update