Resolve merge conflicts on index.html
Resolve merge conflicts on index.html

stackforge/bansho,Freddrickk/adagios-frontend,Freddrickk/adagios-frontend,openstack/bansho,stackforge/bansho,openstack/bansho,stackforge/bansho,openstack/bansho