ddd
Merge branch 'master' of https://github.com/AlfredYang1986/SensisDashBoard

Conflicts:
	src/query/querybase.scala