Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/yilian/music/MainActivity.java
hh