Victor Woeltjen e31d9decdc Merge remote-tracking branch 'github/master' into open245b
Conflicts:
	docs/src/guide/index.md
	platform/core/src/capabilities/InstantiationCapability.js
2015-11-09 15:17:53 -08:00
..
2015-10-29 12:30:13 -07:00
2015-10-29 12:30:13 -07:00
2015-10-29 12:30:13 -07:00