Barebones websocket stuff. Simple message sending/recieving.
Merge pull request #35 from ShadowSam/master

Testing to see if the issue with the button is the localhost pointer
The first step towards entity subscription pages
Merge pull request #37 from ShadowSam/master

Subscriptions from entity pages added. Subscription bug that made all subscriptions risks fixed.
The subscriptions are sort of working.  However I'm getting triplicate events, so there must be something wrong with my query construction or possibly something wrong with fetching lists of subscriptions
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
Changed paging color to blue
Access denied page for initiatives with allowedaccessusers
Added more logic for access denied page
Stuff is mostly working
Merge pull request #38 from Venture-TheSphinxTeam/dev

Dev
Events should now provide informative skills
Merge branch '2kewl4skool' into dev

Conflicts:
	app/controllers/Application.java
	app/models/User.java
Merge pull request #41 from Venture-TheSphinxTeam/dev

Dev
Yingling fix for the fact that we don't havea  jay-z user correctnly so there is a hotfix to replace with RickyWinterborne