Merge branch 'hotfix/0.0.3.4'
Merge branch 'master' of github.com:javierEd/diaspora into develop