fix merge

app/assets/javascripts/application.js

app/assets/javascripts/management/carousel.coffee

app/assets/stylesheets/application/welcome.scss

app/assets/stylesheets/management/carousel.scss

app/controllers/management/carousels_controller.rb

app/controllers/welcome_controller.rb

app/helpers/management/carousel_helper.rb

app/models/carousel.rb

app/models/web_link.rb

app/repositories/active_record/carousel_repository.rb

app/repositories/active_record/main_page_repository.rb

app/repositories/active_record/weblink_repository.rb

app/repositories/orient_db/carousel_repository.rb

app/repositories/orient_db/highlight_repository.rb

app/repositories/orient_db/weblink_repository.rb

app/views/management/carousels/_form.html.erb

app/views/management/carousels/edit.html.erb

app/views/management/carousels/index.html.erb

app/views/management/carousels/new.html.erb

app/views/shared/management/_nav_menu.html.erb