I WILL ADD THE .PROJECT FILE AND .gitignore WILL NOT STOP ME!
Merge remote-tracking branch 'upstream/dev'
In progress
Fixed the problem with subscriptions. String comparisons were set up incorrectly.
Merge pull request #51 from ShadowSam/master

Fixed subscriptions
Functionality for voting (minus the sending of the vote to the PM system) is now completely working
js for keyword search
Merge pull request #52 from ShadowSam/master

Functionality for voting (minus the sending of the vote to the PM system...
Added watching
Adding js for keyword search
Merge pull request #53 from ShadowSam/master

Added watching
Changes for the past week (includes polling on dashboard and user settings)
Most of the user setting stuff
POC for keyword search
Extracting regex query logic to DB class
Adding more info to the catalog page
Merge remote-tracking branch 'upstream/chanelsbranch'