added login through parse
merged main actvitiy