rute employees
Merge branch 'master' of github.com:alexandru-paduraru/servicii

Conflicts:
	app/views/collector/index.html.erb
coll