Update + fix docs
Merge branch 'master' into 1.1.0-dev

Conflicts:
	src/state/state.js
Whitespace