Bundler support
Merge branch 'master' of github.com:florentsolt/photos