Merge https://github.com/LukasReschke/ownCloud-demo
prevent error from stopping contact imports
Merge https://github.com/LukasReschke/ownCloud-demo