Merge pull request #2 from landoffire/master

Update on all the new changes
Adding files.
Update maps/conference_floor_one.tmx

Going back to original warps.
Update maps/conference_floor_one.tmx

Going back to original warps.
Update maps/chishiki_no_sabaku.tmx

Going back to original warps.
Update maps/conference_room.tmx

Graphics update and warp backup.
Update items.xml

Pihro's update.
Changed to Pyro's version of the map
Merge branch 'master' of https://github.com/PyroSamurai/testserver