<data android:scheme="jukugoquiz" android:host="quiz" />
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	apk/JukugoQuizScala.apk