Updates 4-12

Added media-server
Plugin updates