[Issue #245] some controls are working now.
Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start
update sort key when changing preferences
Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into c2_fresh_start
Merge branch 'c2_fresh_start' of https://github.com/azlen/collusion into azlen-c2_fresh_start
added UI for Legend and Controls section for Clock view
fixed merge conflicts
changed class names
made site preferences look like Legend & Controls; Fixed a few things