added maps!!!
Merge remote-tracking branch 'origin/master'
new camera upload changes to fix sizes and navigation