Merge remote-tracking branch 'remotes/origin/dev-SOA2-lena' into dev-SOA-2-vlad
Merge remote-tracking branch 'remotes/origin/dev-SOA-2-vlad' into dev-SOA-2-vlad
Update file upload... not fixed more bugs...