Commite the changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	com.misc.touse.moplaf.timeline.emf.editor/src/com/misc/touse/moplaf/timeline/tousetimeline/presentation/TousetimelineEditor.java