Static pages controller
Test added
Merge branches 'static_pages' and 'master'