Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
Bugfix: When fetching a feed's name, take the title or description, but not the author name.
Only some spaces removed
Merge branch 'master' of github.com:annando/friendica
Merge pull request #1055 from annando/master

Working with GUID and Object-Type - bugfix for API
parse_url: Removing of warnings with invalid charsets
bbcode: New mode for conversion of shared content that will be used for g+ and facebook export.
Removing of some warnings
Merge remote-tracking branch 'upstream/master'
Removing of warnings to make dav work
Merge pull request #1057 from annando/master

Removing of several warnings to make the dav addon work again
Make the friendica android client work again (it had problems with the GUID in the notifications)
The title of bookmark links is now taken instead of the data that was fetched via oembed
Better detection for links in the body that can be removed because of added information.
Merge pull request #1058 from annando/master

Make the friendica android client work again
Merge branch 'u1'

Conflicts:
	include/items.php
Merge branch 'u2'
Merge branch 'u3'
Merge remote-tracking branch 'upstream/master'