Merge pull request #70 from Venture-TheSphinxTeam/dev

Dev
Merge pull request #72 from Venture-TheSphinxTeam/dev

Dev
Merge branch 'master' of https://github.com/ShadowSam/Sphinx
Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/dev'
Merge remote-tracking branch 'upstream/master'
Updating config file to point at dev
Merge pull request #77 from ShadowSam/master

Fixing config file
Fixed issue with editing subscriptions
Merge pull request #78 from ShadowSam/master

Fixed issue with editing subscriptions
Fuck modals, this is driving me crazy.
Finally got the damn Modal to work right.
Modal!
Editing query subs works with facets. Not with event types yet because
saving is not working with event types.
Small string fix
Placeholder tag
Making the changes to the event cards.
Fixing quick search bar.
Adding scrollable divs
Merge remote-tracking branch 'upstream/dev' into chanelsbranch