added some factories and rspec controller, model and integration tests
More factories and integrarion tests + Search button
added some association tests
merge + fix merge conflicts