Merge pull request #10 from shawnsandy/version/bj-timber

Merge branch 'hotfix/widget_header' into develop
Merge pull request #11 from shawnsandy/version/bj-timber

Version/bj timber