conflict issue
Merge branch 'master' of
https://github.com/senthilkumar2githup/Dashboard.git

Conflicts:
	src/main/java/org/hpccsystems/dashboard/controller/CurrentDateFilterController.java
	src/main/java/org/hpccsystems/dashboard/entity/chart/utils/ChartRenderer.java