UI cleanup
patched tests
Merge remote-tracking branch 'upstream/development' into development
Merge pull request #31 from badnack/development

Development
merge fixed