Merge branch 'hotfix/0.4.1.2'
styling wip
styling header bg wip
Merge branch 'develop' of https://github.com/bitcoiners/diaspora into develop