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

Conflicts:
	src/main/webapp/WEB-INF/i3-label_zh.properties