Code cleanup
Merge branch 'mobile' into jquery

Conflicts:
	playlists.py