Renames a big part of remaining "lines"
Merge branch 'master' of github.com:ekylibre/ekylibre

Conflicts:
	Gemfile.lock
Rebuild links