Merge pull request #1 from jspm/master

Update master
Add react-router to registry
Merge pull request #42 from computmaxer/react-router

React router
Merge pull request #41 from Orbs/master

Add angular-ui-tree and ng-multi-transclude
Added Famo.us dependencies and overrides.
Sorted the package list.
Added my fork of Famo.us, trusktr-famous.
Merge pull request #45 from trusktr/master

Added Famo.us dependencies and overrides.
Create bower-angular@1.3.0.json
Create bower-angular-animate@1.3.0.json
Create bower-angular-route@1.3.0.json
Merge pull request #49 from subesokun/patch-1

Create bower-angular@1.3.0.json
Merge pull request #50 from subesokun/patch-2

Create bower-angular-animate@1.3.0.json
Merge pull request #51 from subesokun/patch-3

Create bower-angular-route@1.3.0.json
add pouchdb plus override (3.0.6)
Merge pull request #52 from andreasgrimm/add-pouchdb-plus-override

add pouchdb plus override (3.0.6)
Update registry.json
update angular material (override) and add angular aria to registry
Merge remote-tracking branch 'upstream/master' into update-angular-material-override-add-angular-aria
Merge pull request #53 from andreasgrimm/update-angular-material-override-add-angular-aria

Update angular material override add angular aria
switch react-router from github to npm
Merge branch 'master' into react-router-npm

Conflicts:
	registry.json