upload from album and take picture
Merge branch 'master' of https://github.com/TimLeytens/GF14