Revert "Revert "Merge branch 'master' of https://github.com/ndomar/megasoft-13""

This reverts commit 56cfec1f286f878dddb1d73076b1a682821578fc, reverting samy's revert.
Resolved conflicts, keeping User_managemnt branch on the master
Merge pull request #196 from ndomar/revert_samy_revert

Revert samy revert