first draf on feature 2
Finished feature 2
added missing file and finished feature 2
Merge branch 'feature/f02' into develop