change controller newflat add h1
Merge remote-tracking branch 'origin/master'