added some factories and rspec controller, model and integration tests
More factories and integrarion tests + Search button
New menu, layouting
added some association tests
merge + fix merge conflicts (muntel)
merge + fix merge conflicts
edit layout