tmp
Merge branch 'master' of https://github.com/eugenpirogoff/ransack

Conflicts:
	public/js/client.js