Merge branch 'rel'
Merge branch 'rel'
Merge branch 'rel'
Merge branch 'master' into rel
Merge branch 'rel' into dev
Remove editing/crop from photo upload
Add logout for testing
Show all boxes when loading photos
Add spinner to placeholder images
Add spinner and loading text on initial load
Combine participants list into invite
Make invite non-modal
Link to photos uploaded by user
Show number of people in stream
Remove intermediate filtering step for invite
Long tap to save
Comply with address book delegate methods
Show spinner
Remove participant counter from stream view
Merge branch 'v0.6-photo_loading' into dev