annuaire
Merge branch 'master' of https://github.com/fbeauchamp/remodra

Conflicts:
	server/server.coffee