comit
Merge branch 'master' of https://github.com/facenord-sud/collaide
comit
Merge branch 'master' of https://github.com/facenord-sud/collaide

Conflicts:
	Gemfile
	Gemfile.lock
	config/development.sphinx.conf