only 1 server
updated protactor tests
added socketserver service
updated procfile
updated ui
Merge branch 'develop' of https://github.com/jonniespratley/angular-cms into develop

Conflicts:
	README.md
	package.json
Merge branch 'develop' into feature/passport

Conflicts:
	app/index.html
	app/scripts/controllers/users.coffee
	app/styles/main.css
	app/views/users.html
	package.json
	protractor.conf.js
	routes/rest.js
	server.js
	test/protractor/App.js