Major (Solution) : added users
Major (Solution) : merged with AddUsers
Merge branch 'master' into NewFeatures