changes before tiles

before tiles
dashboard tiles

dashboard tiles
Merge branch 'awakeel_6.0' into umair_
email preview fix