Small corrections...
MAJOR CHANGE of baseindciators, indicators & reports
Merge remote-tracking branch 'origin/master'