no message
Merge branch 'master' of https://github.com/wishoping/l2bq-sample

Conflicts:
	src/main/webapp/dashboard/js/graph.js