More progress on user.
Merge branch 'master' of https://github.com/bveliqi/Catalyzer