Don't return nil
Merge branch 'pjax' into cirandas
Avoid image overlap if the template has 2 side columns
Update theme