Update index.html.md.erb
no message
#fin
Merge branch 'master' into develop

Conflicts:
	source/pages/index.html.md.erb