Added first mockup of the Neighbors Settings edit page
me eche todo lo que habia aqui
Merge remote-tracking branch 'dustet/develop' into develop

Conflicts:
	.rspec
Modified gemspec for bulding gem correctly
Mockup for the neighbors settings model in place
Neighbors Settings Form Mockup in place
Ready to start saving settings to database
Add migration for table spree_neighbors_by_properties
Persisting some association problems
Finish a raw approach to saving the settings to the db
Merge branch 'saving_settings_to_db' into develop
Added some tests and almost functional ajax requests on form
Finished Ajax requests on the form to add and remove neighbors manually
Added missing field on NeighborsSettings and setted the fields values on the settings form
Merge branch 'improving_neighbor_settings_form' into develop
All the data fetching from the database done
Some refectoring made and added the count rest
Added field sorting to neigh sett and updated the form and controllers
Fixed some style issues and a bug saving the sorting option
Merge branch 'add_the_sorting_field_to_neigh_sett' into generate_neighbors_map