fix readme
Change default route to license model. Link publisher and software_package.

modified:   app/models/publisher.rb
modified:   app/models/software_package.rb
modified:   app/views/licenses/index.html.erb
modified:   config/routes.rb
changes to views
fix more merge confilcts