add wikipedia to freebase maps
add comments
Merge remote-tracking branch 'origin/master'