for pull
Merge branch 'master' of https://github.com/ora-ita-fa/prototype
consume Sangeeta's dataSet1
no message
Merge branch 'master' of https://github.com/ora-ita-fa/prototype

Conflicts:
	cdc_em-itaaas/apps/flex_analyzer/web/js/controller/displaying/chart-list.js
	cdc_em-itaaas/fwk/analytics/web/js/controller/timeseries/timeseries-tool.js
introduce ojall