Added Accordion
Resolved conflicts
Added Live feeds