renamed classes and modified Membership
Merge branch 'master' of https://github.com/zinsaf/Project-LMS