merge ( with merge commit) develop to master

this approach will add merge commit (it is quite big) but preserves history form develop (commits numbers are the same) so it is easy to understand which changes are taken to the master