GCP-8180 (fix ui issues)
Merge branch 'branch_release_20140410' of https://github.com/digitalabs/IBPWorkbench into branch_release_20140410