Updates 4-12

Added media-server
Plugin updates
Merge branch 'master' of https://github.com/lakesareadesign/bash.box