camljs 2.5
Merge branch 'master' of github.com:andrei-markeev/DefinitelyTyped into andrei-markeev-master

Conflicts:
	camljs/camljs-tests.ts
Merge branch 'andrei-markeev-master'