index. 0lvl
Merge remote-tracking branch 'origin/react' into react

Conflicts:
	app/config/default-config.coffee
	package.json