Better fix for UI test case logic
Merge branch 'staging' of http://github.com/mcosand/KCSARA-Database into staging