Test
Merge branch 'master' of https://github.com/GHoning/DeLawei

Conflicts:
	js/config.js
	js/screens/speech.js