Resolved merge conflict.

Fixed use of incorrect Camera._recording flag.

Fixed use of incorrect Camera._recording flag.

Fixed use of incorrect Camera._recording flag.

Fixed use of incorrect Camera._recording flag.

Resolved merge conflict.

Fixed use of incorrect Camera._recording flag.

Fixed use of incorrect Camera._recording flag.

Fixed use of incorrect Camera._recording flag.
Merge branch 'master' of https://github.com/justindarc/gaia