Added add substate menu item
Merge branch 'master' into nested_states
Changed index to include source