added puck marker
Merge branch 'master' of https://github.com/University-of-Potsdam-MM/UP.App
added notes for books and detail view and testing for attributes before rendering in templates
Merge branch 'master' of https://github.com/University-of-Potsdam-MM/UP.App
added keywords with url and formated abstract and toc
fixed merge conflicts