Incomplete_AddedButton
Added fb login button
Fixed breaking changes from merging in Facebook Login code (googleID -> ProviderID) and implemented a user collection edit page. Still need to implement functionality to actually remove the photos from the collection.
Merge branch 'master' into user_collections
As a user, I can now delete photos from a collection.