add things that should have been added in the last branch
added some features that should have been in a difent branch

Merge branch 'feature-make_sure_no_change' into development