Added local features.
Merge branch 'master' of https://github.com/chute/photo-picker-plus