Barebones websocket stuff. Simple message sending/recieving.
Fix to ignore application.config'
'
Subscriptions are now workinggit add public/javascripts/subscription.js! If you watch the database (dev) you should see the subscription be added and unadded. Please for testing purposes always leave the status unsubscribed when you are done testing as the setting of the state of the button initially is not in place as of yet. If you have problems with the button itself you may not have your application.conf file anymore. Readd this with your database pointing at dev and the problem should be solved.
Merge pull request #36 from ShadowSam/master

Subscriptions working! No initial setting yet, but toggling functionality now works on that backend as well as the front
Updated subscription button on all tabs and added framework for buttons being set to the correct state on load."
"
PoC of paging working for the dashboard page using pajinate.js. Need to
format it better and fix some CSS stuff.
Merge remote-tracking branch 'upstream/dev'
Setting up some try-catches for if the rest calls can't be made
Paging is now working and formatted nicely.
Merge branch 'dev' of github.com:Venture-TheSphinxTeam/Sphinx into dev
Fixed the query for org wide events
Chnaged paging to 3
Fixing some display issues with paging and adding active page and paging
info.
More CSS stuff
Merge conflicts
Merged
Added subscribing from entity pages and fixed bug that made all subscriptions risk subscriptions.
Merge pull request #37 from ShadowSam/master

Subscriptions from entity pages added. Subscription bug that made all subscriptions risks fixed.
Page refreshes every X min based on the Users' updateFrequency
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx into dev

Conflicts:
	app/controllers/Application.java
	app/models/User.java
	app/views/index.scala.html