upload pictures from pc #2 (still not finished)
Merge remote-tracking branch 'origin/develop' into develop