Merge Memphiz:ios7airplayfix-without xbmc/master commits