Modification map.tmx, and user_data
Created a door
fix conflicts