Merge branch 'hotfix/v0.1' into develop
Updated html
Updated html
Added ribbon.
Merge branch 'hotfix/v0.2' into develop