basic views and urls
Merge branch 'Magda'