Merge pull request #329 from mozilla/261_implement_filtering

261 implement filtering
[Issue #312] added 'Do Not Show Again' option for block sites and hide sites dialogs
[Issue #273] Unify Date/Time formats
[Issue #272] applied new menu control panel design
[Issue #301][Issue #302] styling changes for buttons
bug fix for including the same js file twice
fixes for filtering, better algorithm for getting recent sites in order
Merge branch 'c2_fresh_start' of https://github.com/mozilla/collusion into 261_implement_filtering