Merge branch 'master' of https://github.com/Vader-San/MultimediaTourEditor.git