update gem file
Merge branch 'master' of https://github.com/ekylibre/ekylibre

Conflicts:
	Gemfile.lock
update gem file