MAJ user class
Merge branch 'master' of https://github.com/Shadownest/Promo-S1