added flickr edit favorites pic and delete favorites pic
merge joe's stuff