playlists
Merge remote-tracking branch 'origin/master'

Conflicts:
	SecondWind/Base.lproj/Main.storyboard
	SecondWind/en.lproj/Localizable.strings
	SecondWind/ru-RU.lproj/Localizable.strings