prepare to commit
Revert "prepare to commit"

This reverts commit 1875758f5cef9c7d30d0dfd45dbfa8e8088cffc3.
Improve problems after merge
Merge branch 'master' of github.com:calmarcher/dipstart-development
Merge branch 'Mybr'