Added a StaticPages controller
Updates from 3.2
Updates from 3.3