Voice recognition activity
Merge branch 'master' of https://github.com/leouy/android-player

Conflicts:
	res/values/strings.xml
	src/com/ort/borgplayer/MainActivity.java