Merge branch 'master' of https://github.com/thgie/raum

Conflicts:
app/frontend/basic/templates/index.html
blah