Add server capacity
Merge branch 'master' of github.com:Jigarsolanki/cloud-game

Conflicts:
	public/js/models/entity.js