Merge remote-tracking branch 'origin/frontbackmeld'

And restore gulp comments in index.html

Change-Id: I0f69c7ee776e911f836c3568b82e6a26397ca243