Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/PHR-Android.apk
	bin/classes.dex
	bin/resources.ap_
	gen/com/example/phr/R.java