Merge branch 'master' into Adam-Jones
added back in all photo edit
Merge branch 'Adam-Jones'
Merge branch 'marty'
Merge branch 'master' into marty