Added missing header
Merge branch 'master' of github.com:atiti/AirTame
Windows compilation fixes
Merge branch 'master' of github.com:atiti/AirTame

Conflicts:
	client-v2/audio_playback.h
	client-v2/gss-client.c
	client-v2/ui.h
	client-v2/video_display.h
	common/channel.h
	common/ssdp.h