- Changed camera icon
Merge branch 'origin/master'