bug fixes and data obfuscation support
Merge branch 'eliza_privacy_Student_Trial' into Student_Trial