finetuned feature 6
Merge branch 'nonconflict2' into develop
added a restarter to feature 6
Merge branch 'nonconflict1' into develop