Refactoring image picker controller
Merge branch 'master' of github.com:mikekvintus/aha