added git-flow feature merge_develop

rebases develop branch onto featuer