Module/user auth

merging branch module/UserAuth