added the french locale
Faye browser modifications. Persons marks show up. Still tempering
Forgotten modification to server logic.
fix formatting
Merge branch 'master' of git://github.com/dsilvius/phoenix

Conflicts:
	ui/core/js/node/lib/zmgc.js
	ui/core/js/node/public/client.js
reformat the client.js code