Fix wrong message on infinite scroll on contact page
Merge branch 'hotfix/0.0.3.4'
* Remove unnecessary navigation bar to access mobile site
* Re-add flash warning to registrations mobile
* Remove excess :css
* Fix littles css errors
Convert some stylesheets to SCSS #3796
Merge pull request #4101 from brunomachado/feature/3796-convert-stylesheets-to-scss

Convert some stylesheets to SCSS
Include missing javascript in bookmarklet, regression introduced in commit ffc6c1102efdc5fa7d320a306d168d7feb3c191f. Fixes #4057
Merge pull request #4106 from jaywink/4057-bookmarklet-post-cannot-be-edited

Include missing javascript in bookmarklet to fix uneditable post content
ignore warning about .ruby-version
preview posts in stream
Merge pull request #4099 from svbergerem/feature/post-preview

Preview posts in stream
Fix show more post in my activity mobile page. Close #4108
added shift+enter key from new comment box to submit the comment.
added same feature to publisher
close issues #4017 and 4107 by including jquery.textchange
Always redirect user to downcase version of tags on UTF-8 encoding
Merge branch 'brauliomartinezlm-4058_redirect_to_downcase_version_of_tags' into develop
Add changelog entry for #4017 & #4107
Merge pull request #4112 from marpo60/issues_4017_4107_fixes

close issues #4017 and 4107 by including jquery.textchange
Merge branch '3681-infinite-scroll-on-contact-page' of git://github.com/asphxia/diaspora into develop

Conflicts:
	Changelog.md
bump sidekiq