Added edit account for user
added facebook log in
merge completed