Underscore bug in edit links in location overview fixed
Merge origin/master
Logo file renamed to match given path in the index file
Logo -> logo