Merge pull request #1684 from elupus/mdns

Make sure TXT records are in same order as setup on mdns announce

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/network/AirTunesServer.cpp
Simple merge

diff --cc xbmc/network/linux/ZeroconfAvahi.cpp
Simple merge