Merge pull request #6 from allevato/master

Timeline notification now updates caption of photo instead of inserting ...
Added identifying information to location card.