added user login and partly user registration(due to different issues)
Fixed merging problems and added user login. the user registration is partly done due to different "parse com" dependencies