fix crash bugs
Merge branch 'master' of https://github.com/AlfredYang1986/SensisDashBoard

Conflicts:
	src/controllers/Application.scala
	src/query/traits/MasheryQuery.scala