GUI update
Mergeconflict solved
Merge branch 'master' of github.com:Gi11i4m/ChronoMaticProject