updated to use version 2.5.1 of ui framework
Merge remote-tracking branch 'origin/master'