THRIFT-2818 Trailing commas in array
Client: Node.js
Patch: Chi Vinh Le

This closes #263
THRIFT-2826 html:standalone sometimes ignored
Client: HTML
Patch: Jens Geyer
THRIFT-2824 Flag to disable html escaping doctext
Client: HTML
Patch: Craig Peterson

This closes #266

commit 0df9592deb6dce477600f923745d6cdb113592ae
 Author: Craig Peterson <cpeterson@ancestry.com>
 Date: 2014-11-14T19:12:49Z

adding flag to allow unescaped html in doectexts
THRIFT-2827: C++ - Remove unused tr1/functional include from ProcessorTest

Client: C++
Patch: Aiden Scandella

This closes #267

Include was unused yet was causing compilation problems on platforms
without c++11 tr1
THRIFT-2823: grunt jsjq test fail
Client: JS
Patch: Randy Abernethy

Node no longer supports loading thrift.js from
parent dir, moved to test/build
THRIFT-2828 slightly wrong help screen indent
Client: Compiler (general)
Patch: Jens Geyer

This closes #269
THRIFT-2829 Support haxelib installation via github
Client: Haxe
Patch: Jens Geyer

This closes #268
THRIFT-2823:grunt tests failing
Client: JS
Patch: Randy Abernethy

The lib/js/test/build.xml was copying thrift.js incorrectly.
THRIFT-2830:clean up ant tutorial warnings
Client: Tutorial
Patch: Randy Abernethy

supress spurious ant warnings
THRIFT-2819
Client Node
Patch: Chi Vinh Le

Adds websocket client to Node with tests
.travis.yml: restructure matrix build, add QA, add CMake builds
THRIFT-2807 PHP CS Fix

This closes #252

Patch: Roger Thomas
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/nodejs/lib/thrift/web_server.js
	lib/nodejs/lib/thrift/ws_connection.js
Undo changes in web_server.. it was working perfectly