Merge branch 'hotfix/0.0.3.1'
fix XSS vulnerability in conversations#new, closes #4010
Merge branch 'hotfix/0.0.3.2'
roxml should be loaded from rubygems
Merge pull request #4024 from instrumentio/feature/corrupt-fsck-roxml

roxml should be loaded from rubygems
fade long tag names - refs diaspora/diaspora#3899
Merge pull request #4006 from afrerich/feature/3899-long-tags-break-the-layout

fade long tag names - refs diaspora/diaspora#3899
Updated the Galician (gl) translation.
Merge pull request #4034 from Gallaecio/gl

Updated the Galician (gl) translation.
Remove whitespaces
Avoid unnecessarily redirect
Merge pull request #4037 from marpo60/avoid_redirect

Avoid redirect
Pass the real values to stderr_path and stdout_path in unicorn.rb since it runs a case statement on them
dry up and modularize layouts
add header to sign up page
reset comment box height after posting a comment

refactor create comment method
Merge pull request #4036 from pestrada/4030-resize-textarea-after-commenting

reset comment box height after posting a comment
Show timestamp when hovering on comment time-ago string. Closes #4042
Merge pull request #4046 from embs/feature/4042-show-timestamp-on-comment-hover

Show timestamp when hovering on comment time-ago string. Closes #4042
Merge pull request #3944 from MrZYX/modular_layouts

Modular layouts