fixed #1062, minor fix on reset.scss and updated css
Merge pull request #1068 from garciademarina/issue-1062

fixed #1062, minor fix on reset.scss and updated css
Merge branch 'hotfixes' into develop