merging with master
Merge branch 'master' of https://github.com/clra/Photos
merging changes for url input with master branch