Rename the EntityType enum values.
Rename shop item to shop treasure.
Set the version number to 1.2.
Merge branch 'master' into v1.2
Merge branch 'master' into v1.2
Add a converter for 1.1 to 1.2.
Editor: delete previous backup directories before using them.
Replace file:read("*all") by file:read("*a").

*all is not officially accepted (works with usual Lua but not LuaJ).
Editor: rename shop item to shop treasure.
Fix the map converter.
Starting to implement custom entities.
Register custom entity creation function in the map loader.
Add custom entities to the editor.
Thinking about the custom entity API.
Notes about custom entity detector API.
sprite and directions will be properties of custom entities.
Don't detect the ground if an entity is disabled or being removed.
Specification of music callbacks (#280).
Revert "Specification of music callbacks (#280)."

This will not be in 1.1 after all.
This reverts commit 05459a211387fdcdb28ca0befb62b6c5ae6f9631.
Replace pointers by std::vector in music decoding functions.