fixed userclass
added files
merge