merge files manually from master, rm and add new files in doc/