login screen added
merge