Styling, fix gruntfile
Merge branch 'master' of github.com:SocietyPro/html5-config