Merge pull request #1 from Kaspar94/kaspar-development

Kaspar development
Merge branch 'master' into kaspar-development
veel suuremad muudatused