code cleanup
Merge branch 'master' of https://github.com/Vandborg/SW505E14-Software
Merge branch 'master' into refactoring_holm