hotfix of weird margins in IE and FF
Merge branch 'master' into gh-pages