quit using camera intent to carry file path
Merge branch 'DA-161' into unstable

* DA-161:
  quit using camera intent to carry file path