Unnecessary files related to users deleted
Files related to users merged and refactored
Merge branch 'master' into merge_user_related_files
Merge branch 'master' of https://github.com/rapidftr/RapidFTR into merge_user_related_files
[#1820] Merged the pull request and fixed the merge conflicts