@mzule bugfix
player optimization
group select topic tab
Merge remote-tracking branch 'origin/master'

Conflicts:
	local.properties