update grunt and fix alignment issues css
update grunt & fix alignment issues css
fix alignment issues
Merge branch 'master' into gh-pages