SAK-22450 - bundle strings, comment, rearrange client side things

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/SAK-22450@119949 66ffb92e-73f9-0310-93c1-f5514f145a0a