comment images rename grunt tasks used to avoid cache issues but generate 404 after build task
Merge remote-tracking branch 'origin/master'