add logo
Merge remote-tracking branch 'upstream/master'
cleanup mapfileparser
Merge remote-tracking branch 'upstream/master'