added parse framework & facebook framework
added login with facebook
solve merge conflict