Fix all files
Merge branch 'master' of github.com:sikora/sadplan
Merge branch 'master' of github.com:sikora/sadplan