merge issue
Update toc.xml
Save window position
merge
Merge branch 'master' of https://github.com/vikinghug/VikingGroupFrame
Merge pull request #21 from vikinghug/test-170

Test 170
Merge pull request #22 from midraal/development

bring development back in line with master