Editing CONTENTS and README files
Merge branch 'devel' into sp