Update index for HW 6
Merge branches 'develop' and 'staging' into staging