Cleaning up of branches
Merged all branches locally.

    * Up to date DMap