picture journal bugs camera
Merge pull request #61 from bxl1989/master

camera