Updated Camera Action, to be able to get images into imageview
Merge remote-tracking branch 'origin/master'