Entry locking
Merge branch 'master' of https://github.com/sbenhaim/protobrew

Conflicts:
	client/client.coffee
Merge branch 'master' of https://github.com/sbenhaim/protobrew

Conflicts:
	client/client.coffee