Cleanup socket.io configuration
reorganize config folder

Conflicts:
	.gitignore
	Gruntfile.js
	server/api/user/index.js
	server/components/access/access.js
	server/config/env/all.js
	server/config/env/development.js
	server/config/env/production.js
	server/config/env/test.js
	server/config/helpers/sample_data.js
	server/express.js
Merge branch 'master' into socketio

Conflicts:
	server/app.js
Cleanup express configuration
Consistent style
Merge branch 'master' into socketio
Update style
Removed no cache script middleware
More style updates
Merge branch 'master' into socketio
Update comment style
Merge branch 'master' into socketio