Fix photo ordering in image picker
Merge branch 'master' of https://github.com/Discoverful/SharedCode