Merge branch 'drops' into master

Conflicts:
	src/server/dial_server.c
	src/server/main.c
	src/server/quick_ssdp.c

Change-Id: I0e1e4bedf8206dcf422564b465864e3de2570567
tree: b472be190cd79c5c4194b94fc7ccdfd6a349edda
  1. Changelog
  2. LICENSE
  3. README
  4. Version.h
  5. src/