sync lyrics
Merge branch 'master' of github.com:MusaProject/musa

Conflicts:
	app/models/song.rb
	app/views/admin/songs/edit.html.haml
	config/routes.rb
	db/schema.rb
Merge branch 'master' of github.com:MusaProject/musa