Fixed minor error in test description
Merge branch 'master' of https://github.com/floyd-io/floyd-scala

Conflicts:
	src/test/scala/TestDeviceRegisterActor.scala