Merge branch 'activities' into paris2013
Merge branch 'paris2013' of github.com:sakaiproject/3akai-ux into paris2013
(Paris2013) Initial work for PP images in activities.
(Paris2013) Adding multiple content items for content-related items
(Paris2013) Switch 'medium' to 'normal' for page previews.
Merge pull request #2584 from mrvisser/paris2013-pp-multiplecontent

(Paris2013) Hooking up PP images to activities