I attempted to add copyright information .
Merge branch 'master' of https://github.com/rethinkdb/rethinkdb

Conflicts:
	admin/static/js/encoding.js
	drivers/ruby/quickstart.rb
	drivers/ruby/rethinkdb/utils.rb
	drivers/ruby/test_bt.rb
	src/containers/disk_backed_queue.cc
	src/containers/uuid.cc
	src/serializer/log/lba/in_memory_index.cc
	src/unittest/test_cluster_group.hpp