Addition of Filter columns for new Live Charts
Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard.git

Conflicts:
	src/main/java/org/hpccsystems/dashboard/controller/DashboardController.java