Correct an error in default.
Add the updated_at field in demand.
After creation put datas.
Try a basic support for complexe conflict.
Merge branch '0.1-ConflictModification' into 0.1