Merge branch 'master' into songmenu

Conflicts:
	game/screen_songs.cc
Merge branch 'songmenu' of github.com:performous/performous into songmenu
Sync flashing cover to song BPM. Note loading hack needed for BPM info, needs to be fixed before release.
Merge branch 'songmenu' (local unpushed work from my desktop box)

Conflicts:
	game/screen_sing.cc