Use the mock service, add features as needed
Use the mock service, add features as needed

Conflicts:
	app/js/controllers.js

WTK: I removed everything except websocket.js (originally services.js)
since we're splitting out the websocket code.

wking/angular-websocket-service,azurestandard/angular-websocket-service