aded function readprop
Merge branch 'master' into release_1.1
added trim in edit.php