config dev
Merge branch 'master' of https://github.com/Lpcm/cahier

Conflicts:
	public/javascripts/lib/config.js