Merge branch 'master' of https://github.com/Vadskye/CS160-Speech-Tutor

Conflicts:
	SpeechTutor/libs/armeabi-v7a/libpocketsphinx_jni.so
	SpeechTutor/libs/armeabi/libpocketsphinx_jni.so
	SpeechTutor/libs/mips/libpocketsphinx_jni.so
	SpeechTutor/libs/pocketsphinx-android-0.8-nolib.jar
	SpeechTutor/libs/x86/libpocketsphinx_jni.so