Merging in changes (r5474): Should be able to move TextSnippets between categories.
Merging in changes (r5474): Should be able to move TextSnippets between categories.

haakonsk/O2-CMS,haakonsk/O2-CMS,haakonsk/O2-CMS,haakonsk/O2-CMS,haakonsk/O2-CMS