merged changes and fixed conflicts
removed two logs and added chart templates
added logs to indicator computation service
updated indicator value and group indicator value toString methods, and updated chart templates and chart tabs message properties
updated dashboard to filter indicators on category, updated variable names in indicator value, and updated dashboard initializer