align rightbar icon heart
Refactor right side bar, see you, BRs.
Update English locales to diaspora* instead of Diaspora.
new wordpress icons
Merge pull request #4797 from goobertron/capitalisation

Update English locales to diaspora* instead of Diaspora.
Remove the limit to 8 pictures in the view
Merge pull request #4796 from Flaburgan/more-photos-than-8

Remove the limit to 8 pictures in the view
added comment count to statistic to calculate posts/comments ratios

fixeds tests for comment count in statistics

added changelog entry and default entry
Merge pull request #4793 from Flaburgan/refactor-right-side-bar

Refactor right side bar, see you, BRs.
Merge pull request #4799 from JannikStreek/feature/4778-comment_counters

Added count of comments to statistics
Put #4799 changelog to correct place
Add devise_lastseenable for user last seen tracking.
Adds a timestamp to user model which is touched when user comes back. Statistics active users counts now use these more reliable timestamps. Fixes #4734
Merge pull request #4802 from jaywink/devise_lastseenable

Add devise_lastseenable for user last seen tracking.
Fixed heart icon height in right sidebar
Merge pull request #4808 from vcuculo/fix-heart-icon

Fixed heart icon height in right sidebar
Merge pull request #4787 from arlogn/new-wordpress-logo-icon

New wordpress logo icon

Conflicts:
	app/assets/stylesheets/application.css.sass
Updated the Galician (gl) translation
Merge pull request #4809 from Gallaecio/gl

Updated the Galician (gl) translation