doc
Merge branch 'master' of https://github.com/limikael/netpoker

Conflicts:
	test/view/netpokerclient.bundle.js