Update bundler to 1.5 series.
Update rake.
Update uglifier to 2.4 series.
Travis: Also test on Ruby 2.0.0.
Travis: Also test on Ruby 2.0.0.

(cherry picked from commit 080b862aa221641c02fd7a6c79d4c6c7b2b977a9)
Fix that 'last login' didn't show year, only day and month. Closes #455.
Merge remote-tracking branch 'origin/v1.x'

Conflicts:
	spec/views/members/index.html.haml_spec.rb
Change 'From' address for notification emails to 'no-reply@oneclickorgs.com'.
Emails: Move organisation name to subject; in 'From' use OCO instead.
Add OCO contact link to footer of emails.
Merge branch 'gh339' into v1.x
Merge remote-tracking branch 'origin/v1.x'
Add missing email footer links to OCO.
Upgrade multi_test.
Use new session cookie name, so upgrades to Rails >=3.1 don't error. Closes #456.

If you send a Rails <3.1 cookie to a Rails >=3.1 app, an
ArgumentError (dump format error) is raised. We can work around this
by changing our session cookie name, which stops the app from trying
to read the old cookie, and forces a new cookie to be created.
Merge remote-tracking branch 'origin/v1.x'
Automatic schema uodate.
Merge remote-tracking branch 'origin/master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/local_settings.rb.sample