me eche todo lo que habia aqui
Merge remote-tracking branch 'dustet/develop' into develop

Conflicts:
	.rspec
Merge remote-tracking branch 'dustet/develop' into develop
relocating javascripts
rellocating javascripts
cleaning javascripts
rellocating css
cleaning css
fixing generator
fixing gemfile
fixing versions
gemspec
ignoring locatable nil
including stuff
paginating settings
fixing pagination
fixing
Merge branch 'develop' into 2-3-stable

Conflicts:
	Gemfile
	README.md
	Versionfile
	app/assets/javascripts/admin/spree_neighbors.js
	app/assets/javascripts/store/spree_neighbors.js
	app/assets/stylesheets/spree/backend/spree_neighbors.css
	app/assets/stylesheets/store/spree_neighbors.css
	spree_neighbors.gemspec
removing some autorization
fixing a bug