- flickr api updates
Merge branch 'master' of https://github.com/pidgpowell/KidsFlickrApp

Conflicts:
	app/KidsPhotos/Storage/Flickr.php
	app/config/app.php