add a StaticPages controller
finish static pages:
merge differences