modify for CDR
Merge branch 'CDR' of https://github.com/JaneBlue/Web into CDR