Merge branch 'development'
Merge branch 'release-2.0'
Update some photos.