merge query string instead of add question mark
Merge branch 'master' of github.com:andreazaupa/rails_admin_globalize

Conflicts:
	app/assets/javascripts/rails_admin/custom/rails_admin_globalize.js