let´s put the files_odfviewer application into the stable4 branch for convinience. We release it as part of ownCloud 4.0.x anyways.

Conflicts:

	apps/contacts/ajax/uploadphoto.php

fix for bug #872: Folders not holding any images are ignored, even if they hold subfolders with images

a salt is generated during setup and used to salt the user password hases in the database backend