added stateProvider feature
Merge branch 'feature-stateProvider' into develop