quick update
small updates
upgrade to mmd cms advanced
fix merge