Added playlist view
Merge branch 'master' of https://github.com/Rollon/Rollon
Merge branch 'master' of https://github.com/Rollon/Rollon

Conflicts:
	res/values/strings.xml