Fixed Photographer menu. If you cancel, it doesn't die.
Merge branch 'master' of https://github.com/AVATAR-PANIC/AVATAR-PANIC.git