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