Merge branch 'server_tests' of github.com:rosette-proj/rosette-server into server_tests

Conflicts:
	spec/spec_helper.rb
	spec/versions/v1_spec.rb