Merge conflicts resolved
Merge pull request #12 from bvs90/widgetHome

Merge conflicts resolved