Update copyright year to 2014

A bit late, I guess! We’re well in 2014 now.
Update Gemfile.lock
Merge branch 'release-3.6.x'

Conflicts:
	Gemfile.lock