Andy Hanson 89d6358b54 Merge remote-tracking branch 'origin/master' into merge_24sep ...

Conflicts:
	angular-material/angular-material.d.ts
	bookshelf/bookshelf.d.ts
	react-widgets/react-widgets.d.ts
	vinyl/vinyl.d.ts

2016-09-24 16:40:57 -07:00

..

lib

…

index.d.ts

…

react-widgets-tests.tsx

…

tsconfig.json

…