login page verifies user/pass on server
login verification works in iOS
merging changes