merge commit
Merge branch 'Graphics' of github.com:Lorac/undo-redo-example into Graphics

Conflicts:
	src/main/java/com/mconflict/exemple/undo_redo/model/RectangleComponent.java