Added websocket stuff...finally
Merge branch 'master' of github.com:parsons-mfadt-jkosoy/2014-spring-dynamic-interfaces