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'
Preventing duplicates from saved queries
Fixed the radio button issue on keyword search.
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx.git into dev
This should ensure that all events have entities attached to them
Merge pull request #76 from Venture-TheSphinxTeam/chanelsbranch

Chanelsbranch
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
Favicon, ho! Thar she be, that round blue whale of a creature.
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!