update basiv
docs update
update
Merge branch 'addStateProvider' into develop

Conflicts:
	app/src/main.js