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

Conflicts:
	Gemfile.lock