Add Properties class
Add Properties class
Add Properties parameters
Add Tiled editor-specified properties
Fix conflicts again