DRY for Charts. Fixed Activity.
Merge branch 'feature/angular' of codebasehq.com:playgen/celar/datacon into feature/angular