Merge merging2 into merging3
Fixed nullptrexception in login
Merge merging3
Merge merging3