Mysql fix
Merge branch 'master' of github.com:sumdog/BigSense

Conflicts:
	src/main/scala/io/bigsense/db/DataHandlerTrait.scala