Changelog note for change in jQuery CDN default
Merge pull request #5164 from goobertron/tos_notes

Changelog note for change in jQuery CDN default
Remove validation.js from mobile sign in page (fix regression)
Merge branch 'release/0.4.1.0' into develop
Redesign contacts page
Increase max length of simple_captcha to 12
Simplified range check
Display all contacts in the contact list
Add contacts search and port aspect membership save/destroy to backbone
Small style changes, add tests
Add visibilit icons in publisher dropdown aspect
Add jasmine tests
Merge pull request #5169 from jaideng123/5157-Increase_captcha_field_length

Increase max length of simple_captcha to 12
Rspec version bump to 2.99
Two tests failing after rspec 2.99 => 3.0.0
No deprecation warnings, but one spec still fails (but only when I run all the specs, not when I run just the one spec)
Merge branch 'develop' into issue_5149

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/conversations_controller_spec.rb
	spec/controllers/people_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/integration/receiving_spec.rb
	spec/lib/postzord/receiver/public_spec.rb
	spec/models/post_spec.rb
	spec/models/user/querying_spec.rb
Updating cucumber features
Convert specs to RSpec 3.0.4 syntax with Transpec

This conversion is done by Transpec 2.3.6 with the following command:
    transpec features

* 19 conversions
    from: obj.should
      to: expect(obj).to

* 1 conversion
    from: == expected
      to: eq(expected)

For more details: https://github.com/yujinakayama/transpec#supported-conversions
Bumping rspec to 3.0.2