made map & camera
Merge remote-tracking branch 'origin/master'