Fixed some errors
Merge remote-tracking branch 'origin/master'

Conflicts:
	recognition/src/main/scala/com/liberty/handlers/VoiceHandler.scala