This reverts commit c08121e6.

This reverts commit 3faca838.

This reverts commit 1481056a.

This reverts commit fb70dc8c, reversing
changes made to 53fef63a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb

This reverts commit 4bb5aeb3, reversing
changes made to fb70dc8c.

patching websocket_server.rb to provide a pidfile, important
for SystemV init files. Ubuntu upstart configuration. Bugfixes

status message show is now a real show page.  photo partial in stream shouldn't display a slideshow of album.

Conflicts:
	pkg/ubuntu/diaspora-setup

Conflicts:
	spec/models/user/invite_spec.rb