Pull request: importing more indicators, more configurations changes, SQL changes

Also
Renaming 7_metadata.sql to 6_metadata.sql

Renaming 6_samples-for-xls-overview.sql to
7_samples-for-xls-overview.sql