static_pages_controller added.
fixed merge conflict