Se sube buscador de listados.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/top_bar.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/top_bar.html
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/views/top_bar.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.js
	server/config.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.js
	server/config.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.js
	client/views/user/users_list.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.js
	client/views/user/users_list.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app.js
	client/views/user/users_list.html
Merge remote-tracking branch 'origin/master'
Se sube css para imagenes de usuarios