finished refactoring nova states
Merge branch 'dev-nova' into develop