Merge pull request #1070 from annando/master

Moved "privacy_image_cache" into the core.
Merge pull request #1072 from annando/master

Less visible options when connecting a friendica contact
Merge pull request #1084 from annando/master

Displaying the author of a post on the "display" page/network page as default page after login
increase guid.guid field length for redmatrix-over-diaspora communications
Merge pull request #1086 from annando/master

Bugfix: Connecting with other users works again/Some more profile optimizing
Merge pull request #1088 from annando/master

Bugfix: It was impossible to add groups.
Merge pull request #1089 from annando/master

Remote-Self is now working fine/contact page instead of remote profile when contact is added
resize the item guid field for protocol compatibility - it's getting truncated.
Merge https://github.com/friendica/friendica into pull
Merge pull request #1090 from annando/master

dbstructure: Delete indexes before the database structure is changed
so this is why my db updates were reverted ;-)
Merge https://github.com/friendica/friendica into pull
Merge pull request #1092 from annando/master

Bugfix: Messages when ignoring, blocking and archiving contacts now returns the correct text.
Merge pull request #1093 from annando/master

Added an alternate link to the profile in the atom feeds (feature request #925)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	boot.php
	update.php