tabelle für genre_info angelegt und edit der genre_info implementiert
Merge branch 'master' of https://github.com/Lepetere/MusicGraph.git

Conflicts:
	app/assets/javascripts/show_graph.js
	app/assets/stylesheets/menu.css
	app/controllers/show_graph_controller.rb
	app/views/show_graph/_menu.html.erb
	log/development.log