Join Fixes
commit fix
Merge branch 'master' of https://github.com/dhanasiddharth/Dashboard.git

Conflicts:
	src/main/webapp/demo/css/flat.css
	src/main/webapp/demo/layout/template.zul