Reorganized DefaultController and StaticPageController
Reorganized DefaultController
Merge branch 'dev'