update
Merge branch 'master' of http://github.com/cloud66-samples/diaspora