Adds layout templates
Merges page and popup layouts
Replaces includes of header and footer to inheritance of layout
Merge branch 'smarty_template_inheritance'
Merge pull request #260 from maciejlew/master

Adds layout template inheritance