ui framework testing
Merge branch 'master' of https://github.com/SQuantock/uiframeworktest