new theme for DMCM
reverting to old logo
resolving conflict
Merge pull request #16 from enStratus/new_theme

New theme changes