Recommiting My changes
Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard.git

Conflicts:
	src/main/java/org/hpccsystems/dashboard/controller/EditChartController.java
	src/main/java/org/hpccsystems/dashboard/controller/EditWidgetController.java
	src/main/java/org/hpccsystems/dashboard/controller/JoinController.java
	src/main/java/org/hpccsystems/dashboard/entity/chart/ChartData.java
	src/main/java/org/hpccsystems/dashboard/entity/chart/Join.java
	src/main/java/org/hpccsystems/dashboard/services/impl/HPCCServiceImpl.java
	src/main/webapp/WEB-INF/i3-label.properties
	src/main/webapp/demo/layout/edit_chart.zul
	src/main/webapp/demo/layout/edit_join_data.zul
	src/main/webapp/demo/layout/edit_portlet.zul