add player following stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/res/layout-land/activity_player.xml
fix player columns issue when activity recreated