cleanup in states
Change FrameSet to be a manager for collection of Frames
Merge pull request #538 from demaagdk/develop

Develop