add index on foreign keys
Merge branch 'master' into staging