Merge branch 'master' into types-2.0-20160816

# Conflicts:
#	acl/index.d.ts
#	anydb-sql-migrations/anydb-sql-migrations.d.ts
#	asana/asana.d.ts
#	blue-tape/blue-tape-tests.ts
#	bluebird-retry/bluebird-retry-tests.ts
#	bluebird-retry/bluebird-retry.d.ts
#	bluebird/index.d.ts
#	bookshelf/bookshelf.d.ts
#	consolidate/consolidate.d.ts
#	documentdb/documentdb.d.ts
#	fs-extra-promise/fs-extra-promise.d.ts
#	graphene-pk11/graphene-pk11.d.ts
#	inline-css/inline-css.d.ts
#	inversify/index.d.ts
#	java/java-tests.ts
#	karma/karma.d.ts
#	knex/knex.d.ts
#	koa-router/koa-router.d.ts
#	libxmljs/libxmljs-tests.ts
#	lru-cache/lru-cache.d.ts
#	mz/index.d.ts
#	node-mysql-wrapper/node-mysql-wrapper-tests.ts
#	node-mysql-wrapper/node-mysql-wrapper.d.ts
#	nodemailer/nodemailer.d.ts
#	pify/pify-tests.ts
#	project-oxford/project-oxford-tests.ts
#	project-oxford/project-oxford.d.ts
#	react-router/react-router-tests.tsx
#	react-scroll/react-scroll.d.ts
#	redlock/redlock.d.ts
#	request-promise/index.d.ts
#	rethinkdb/rethinkdb.d.ts
#	sequelize/sequelize.d.ts
#	stamplay-js-sdk/index.d.ts
#	stripe-node/stripe-node.d.ts
#	umzug/umzug.d.ts

react-scroll/index.d.ts

@@ -1,12 +1,14 @@
-// Type definitions for redux-immutable v3.0.5
+// Type definitions for react-scroll
 // Project: https://github.com/fisshy/react-scroll
-// Definitions by: Pedro Pereira <https://github.com/oizie>
+// Definitions by: Ioannis Kokkinidis <www.github.com/sudoplz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as React from 'react';
 
 interface Link extends React.ClassicComponentClass<any> { }
 interface Element extends React.ClassicComponentClass<any> { }
+interface Button extends React.ClassicComponentClass<any> {}
+interface DirectLink extends React.ClassicComponentClass<any> {}
 
 interface scrollEvnt {
     register(evtName: string, callback: Function): void,
@@ -21,14 +23,44 @@ interface scroller {
     scrollTo(to: any, animate?: any, duration?: any, offset?: any): void
 }
 
+interface scrollSpy {
+    update() : void
+}
+
+interface animateScroll {
+    scrollToTop(options?: any) : void,
+    scrollToBottom(options?: any) : void,
+    scrollTo(toY: number, options?: any) : void,
+    scrollMore(toY: number, options?: any) : void,
+}
+
+interface directScroller {
+    get() : any
+}
+
+interface Helpers {
+}
+
 declare const Link: Link;
 declare const Element: Element;
 declare const Events: Events;
 declare const scroller: scroller;
+declare const DirectLink: DirectLink;
+declare const Button: Button;
+declare const scrollSpy: scrollSpy;
+declare const directScroller: directScroller;
+declare const Helpers: Helpers;
+declare const animateScroll: animateScroll;
 
 export {
-Link,
-Element,
-Events,
-scroller
+    Link,
+    Element,
+    Events,
+    scroller,
+    scrollSpy,
+    directScroller,
+    DirectLink,
+    Button,
+    Helpers,
+    animateScroll
 }