Merge commit 'origin/master~200' into zhengbli_merge

# Conflicts:
#	acl/index.d.ts
#	angular-dynamic-locale/angular-dynamic-locale.d.ts
#	angular-signalr-hub/angular-signalr-hub-tests.ts
#	angular-signalr-hub/index.d.ts
#	angular-touchspin/angular-touchspin.d.ts
#	angularjs/angular-sanitize.d.ts
#	apn/apn.d.ts
#	aws-sdk/index.d.ts
#	babel-traverse/babel-traverse.d.ts
#	browser-sync/browser-sync.d.ts
#	bunyan-config/bunyan-config-tests.ts
#	cheap-ruler/cheap-ruler-tests.ts
#	connect-mongo/connect-mongo.d.ts
#	cropperjs/cropperjs-tests.ts
#	cropperjs/index.d.ts
#	ej.web.all/ej.web.all-tests.ts
#	ejs/ejs.d.ts
#	express-mung/express-mung-tests.ts
#	fbsdk/fbsdk-tests.ts
#	graphql/graphql-tests.ts
#	hapi-decorators/hapi-decorators-tests.ts
#	hapi-decorators/tsconfig.json
#	hapi/hapi-8.2.0.d.ts
#	hapi/hapi.d.ts
#	helmet/index.d.ts
#	hyperscript/hyperscript-tests.ts
#	jasmine/index.d.ts
#	jquery-alertable/jquery-alertable-tests.ts
#	jquery.pnotify/index.d.ts
#	klaw/klaw-tests.ts
#	koa-bodyparser/koa-bodyparser.d.ts
#	kue/index.d.ts
#	localforage-cordovasqlitedriver/localforage-cordovasqlitedriver-tests.ts
#	memwatch-next/memwatch-next-tests.ts
#	murmurhash3js/murmurhash3js-tests.ts
#	ng-file-upload/ng-file-upload.d.ts
#	ngeohash/ngeohash-tests.ts
#	node-schedule/node-schedule.d.ts
#	openlayers/openlayers-tests.ts
#	parse5/parse5.d.ts
#	parsimmon/parsimmon.d.ts
#	pem/pem-tests.ts
#	perfect-scrollbar/perfect-scrollbar-tests.ts
#	react-bootstrap-table/react-bootstrap-table.d.ts
#	react-router/react-router.d.ts
#	redux-devtools/redux-devtools.d.ts
#	restify/index.d.ts
#	rethinkdb/rethinkdb.d.ts
#	riot/riot-tests.ts
#	sat/sat-tests.ts
#	sequelize/sequelize.d.ts
#	shallowequal/shallowequal-tests.ts
#	spdy/spdy-tests.ts
#	swagger-jsdoc/swagger-jsdoc-tests.ts
#	through2/through2-tests.ts
#	through2/through2.d.ts
#	tilebelt/tilebelt-tests.ts
#	transducers-js/transducers-js-tests.ts
#	turf/turf-tests.ts
#	tz-format/tz-format-tests.ts
#	urlrouter/urlrouter.d.ts
#	vitalsigns/vitalsigns-tests.ts
#	weapp-api/weapp-api-tests.ts
#	webpack/webpack.d.ts
#	websocket/websocket.d.ts

hyperscript/hyperscript.d.ts

@@ -0,0 +1,19 @@
+// Type definitions for hyperscript
+// Project: https://github.com/dominictarr/hyperscript
+// Definitions by: Mike Linkovich <https://github.com/spacejack>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module 'hyperscript' {
+
+	interface HyperScript {
+		/** Creates an HTML element */
+		(tagName: string, ...args: any[]): HTMLElement;
+		/** Cleans up any event handlers created by this hyperscript context */
+		cleanup(): void;
+		/** Creates a new hyperscript context */
+		context(): HyperScript;
+	}
+
+	const h: HyperScript;
+	export = h;
+}