Bringing up-to-date prior to pull request from Steve
Merge branch 'mergeTakePhoto' of github.com:zdrossman/TAN into mergeTakePhoto