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.
Merge branch 'v1.2'

Conflicts:
	ChangeLog
	src/entities/ShopTreasure.cpp
	tools/org/solarus/editor/Project.java