modified:   Encoder Demo/Encoder Demo-Info.plist
	modified:   Encoder Demo/EncoderDemoViewController.m
Merge branch 'broadcast' of github.com:mobdim/H264-RTSP-Server-iOS into broadcast

Conflicts:
	Encoder Demo/Encoder Demo-Info.plist
	Encoder Demo/EncoderDemoViewController.m