Conflicts:
	apps/contacts/lib/vcard.php
	apps/files/index.php
	lib/files.php

Refactor again so we can tell what item is being reshared in case the same source shows up. This is the end of the share_api branch, moving to master.

Large refactoring to allow for the same item to be shared to a group and again with a user in the group with different permissions

Use SCRIPT_NAME instead of PHP_SELF which won't send the PATH_INFO, this prevents XSS in old browsers. Thanks to Nico Golde.

Merge commit 'refs/merge-requests/139' of git://gitorious.org/owncloud/owncloud into merge-requests/139

It has been reported problems with the javascript that hides the
login button so jancborchardt okayed that I made this change.