REVERT 4-confict

Conflicts:
css/shanti-main-mb.css