Dev

Get the charts branch upto speed with dev branch. Mediator has some minor tweaks.