Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard

Conflicts:
	src/main/java/org/hpccsystems/dashboard/controller/DashboardController.java
	src/main/java/org/hpccsystems/dashboard/services/impl/HPCCServiceImpl.java
Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard