Layout for feed
merge master into h.b
Still working on toolbar
Merge pull request #2 from SEDAWGS/Hichams-Branch

Hichams branch