Improved Flickr API handling
Merge branch 'master' of https://github.com/idno/Flickr

Conflicts:
	templates/default/account/flickr.tpl.php