Mergin in the java 1.8 compability missing corrections
Added more available colors to assign to each line and added test functionality
Small correction, changed a method to not being static since there as no use for it being static
Merge remote-tracking branch 'origin/master' into is35MergeChangesWhenSaving
Merge seems to work fairly stable and with no exceptions.

TODO:
Need to start and stop the running thread correctly in FileChangeListener when diagram is opened and closed.
Need to create the merge as an action that can be reversed with CTRL - Z.
FileChangeListener is now started and stopped correctly when diagrams are opened, saved to new files and closed.

Remaining is to do the merge as an action that can be undone and redone.
Done