periodic Merge remote-tracking branch 'origin/master' into webserver

Conflicts:
	game/screen_playlist.cc
	game/screen_playlist.hh
implemented search 2.0 still need to change javascript website though

the old system send the whole song database to the webbrowser and
searching the database was local on the webbrowser itself, this turned
out to be very slow with 2000+ songs and you could only search on title
and artist, not the folders in which they are stored.

this new system uses performous to do the search it sends a string to /
matching songs, this makes the web-frontend more responsive with large
databases up to 10000 songs (believe me, I have them) and it allows you
to search on folder-name which is useful because in my database the
folders have the names of the tv-series the songs belong to, wich means
for me I can now search on tv-series.

I still have to implement this in the site but a quick test with curl
proves to work perfectly.

the old /api/getDatabase.json will still be used, I'm planning on
putting the data in a table to print out a list of available songs.
added new search methid to web page
rearranged UI and added enter-keypress-event for enhanced searching
Merge branch 'master' into webserver
Merge branch 'master' into webserver
Merge branch 'master' into webserver
Merge branch 'master' into webserver
have the annoying dialog closed after 10 sec.
this is especially for the autoplay-stuff,
since I've got 3000+ songs and a few of them have broken notes displaying this dialog (songs just play fine)
I will use performous next tomocon where it will be on autoplay when i'm not there so it's really annoying having this dialog cover the songs until i return!
have the annoying dialog closed after 10 sec.
this is especially for the autoplay-stuff,
since I've got 3000+ songs and a few of them have broken notes displaying this dialog (songs just play fine)
I will use performous next tomocon where it will be on autoplay when i'm not there so it's really annoying having this dialog cover the songs until i return!
Created an interactive songlist viewer on page 1 suitable for printing
updated Japanese translation
Merge branch 'master' of https://github.com/performous/performous
Set full instrument track volume at start. Closes #66.
added visual feedback when adding a song
Fixed program "flow" when autoplay hits a duet song & display score for
dance/guitar even when karaoke-mode is enabled.
display the second line in duet mode
 - because it's very annoying if you don't know the lyrics and lines
just "suddenly" pop up
periodic Merge branch 'master' into webserver
Merge branch 'webserver' into danceoverhaul

Conflicts:
	game/screen_playlist.hh