OStatus conversations: Fixed a bug when a message hadn't got an id.
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
Vier: The change from blue to black in links is now faded as well.
Explicitly list protocols that are allowed, rather than using their initials.  Also, add cid, which I need for my mailstream plugin to work.
The post_remote_end hook was being called with an escaped version of the item, not very useful.  This change moves the hook to the end of item_store and gets all data fresh from the database.
Merge pull request #646 from annando/master

OStatus conversations, "vier" and diaspora android client
Merge pull request #648 from mexon/mailstream-prerequisites

Mailstream prerequisites
	deleted:    view/theme/smoothly/login.tpl
	deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
Restore redirect functionality removed by change 452ff19d
prevent infinite redirect on network page for non-existant group
Merge pull request #650 from fermionic/20130316-network-infinite-redirect

prevent infinite redirect on network page for non-existant group
double encode any text that is destined for meta fields.
Merge https://github.com/friendica/friendica into pull
don't allow deleted accounts to appear on "manage" page
Merge pull request #649 from mexon/redirect_fix

Restore redirect functionality removed by change 452ff19d
rm addon.old
Merge https://github.com/friendica/friendica into pull