Fix project to html5 boilerplate
Merge remote-tracking branch 'origin/master'