rename Local to HTTPStreaming
Merge branch 'master' into filter

Conflicts:
	ios-client/multimusic.xcodeproj/project.pbxproj
	ios-client/multimusic/MUMAppDelegate.m
	ios-client/multimusic/Models/HTTPStreamingTrack.m