added sorting during indicatoration
Merge branch 'master' into make-indicatorator-order-data

Conflicts:
	server/components/indicatorator/lib/indicatorator.coffee
	server/components/indicatorator/test/lib/indicatorator.coffee
fixed wrong indentation in indicatorator and test
Merge pull request #327 from unepwcmc/make-indicatorator-order-data

added sorting during indicatoration