sakaiproject/3akai-ux — pull request #2083 by gsilver (2012-05-07 19:29:02+00:00)
Title: Sakiii 5395

https://jira.sakaiproject.org/browse/SAKIII-5395
- new PR targeting 1.5.0, also conflicts addressed