Merge pull request #50 from jmpascal/master

Bug fix
MOBILE-1193 / MOBILE-1191 / MOBILE-1195 : Manage exception during
upload/update with content non available locally
Merge remote-tracking branch 'parent/master'