Add dynamic navigation and content
Refactor layout and theme templates
Merge branch 'master' of github.com:potzenheimer/dae