Merge branch 'develop'
[pithos-ios] / Images / camera-icon.png
Images/camera-icon.png