Upadate

fix bug
running CMS

old + new
Update 17-07

new CMS
CMS

Full CMS with all the updates