review 1.1-1.29, change encoding to utf8(no bom),merge from develop