adding stuff for the views and the basic templates
Merge branch 'daniel'