fix bug in conversations view causing server error
Fix markdown indication in the publisher when the user upload an image
Fix: remove location when publisher is cleared by user
bookmarklet publisher more usable
Merge pull request #4668 from ZBarg/feature/remove-location-when-publisher-cleared

Fix: remove location when publisher is cleared by user
Merge pull request #4667 from Flaburgan/fix-markdown-display

Fix markdown indication in the publisher when the user upload an image
Enable Ruby 1.9.3 on Travis

https://www.loomio.org/discussions/10519?proposal=6611
Simple captcha for signup page
Add mobile signup page captcha. Add test for user.sign_up method. Rewrite simple_captcha views to haml. Revert .rvmrc, fix indentation in config examp$
Instead of redirect on signup form validation, render new with submitted data.
Merge pull request #4659 from jaywink/simple-captca-for-signup-page

Simple captca for signup page
Merge pull request #4670 from arlogn/bookmarklet-publisher-more-usable

bookmarklet publisher more usable
bookmarklet publisher more usable mobile
Merge pull request #4677 from arlogn/bookmarklet-publisher-more-usable-mobile

bookmarklet publisher more usable mobile
Merge pull request #4665 from svbergerem/fix-500-conversations

fix bug in conversations view causing server error
Merge pull request #4666 from jaywink/signup-form-error-redirect

Instead of redirect on signup form validation, render new
Change NSFW explanation on profile settings page (and stop altering of text depending on NSFW setting)
bump Timecop
Time.now remains the same inside the block, outside of the block it
returns
Add compatibility layer for old rubyzip

https://github.com/rubyzip/rubyzip#important-note
bump sidekiq