Added persistent states to the state stack
Merged inventory with persistent states
Merge branch 'master' of github.com:Howser/oscMrk-II