cleanup merge conflict
update MANIFEST
update Changes file for 1.05
Merge remote-tracking branch 'upstream/master'
silence warnings while testing
fix find_special_folder if another class attribute is present
don't ship .mo files