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

Conflicts:
	app/views/group/work_groups/new.html.haml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
# Changes to be committed:
#
#	modified:   .gitignore
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	new file:   app/controllers/comments_controller.rb
#	new file:   app/controllers/group/group_comments_controller.rb
#	new file:   app/models/ManageLog.rb
#	modified:   app/models/concerns/letsrate_2.rb
#	modified:   app/models/document/document.rb
#	modified:   app/models/group/group.rb
#	modified:   config/initializers/rails_admin.rb
#	new file:   config/schedule.rb
#	new file:   log/2014-02/2014-02-05.log
#
# Changes not staged for commit:
#   (use "git add/rm <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	deleted:    db/migrate/20140204023303_create_repository_manager.rb
#	deleted:    db/migrate/20140205111023_create_repository_manager.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	2
#	5