Merge branch 'master' of https://github.com/CodesummitGoats/MTRX

Conflicts:
less/components/o-footers.less
merges conflicts