lyricwiki: Update for vfs_async changes.
Use standard C++ types.
cdaudio-ng: Use QueuedFunc.
Missed gpointer in the type conversions.
Use String() instead of null pointers.
Merge branch 'master' into gtk3

Conflicts:
	src/alarm/interface.cc
	src/aosd/aosd_ui.cc
	src/blur_scope/blur_scope.cc
	src/cairo-spectrum/cairo-spectrum.cc
	src/gl-spectrum/gl-spectrum.cc
	src/gtkui/ui_gtk.cc
	src/gtkui/ui_infoarea.cc
	src/gtkui/ui_playlist_notebook.cc
	src/gtkui/ui_statusbar.cc
	src/skins/draw-compat.h
	src/skins/ui_skin.cc
	src/skins/ui_skin.h
	src/skins/ui_skin_load_ini.cc