Merge.
Facebook authentication added.