实现了"单曲"和"文章"的收藏
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/genovia/luoo/MainActivity.java