Merge pull request #1124 from jmarshallnz/prompt_for_rescan

Prompt for rescan of music

diff --cc language/English/strings.po
Simple merge

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/Application.h
Simple merge

diff --cc xbmc/music/infoscanner/MusicInfoScanner.cpp
Simple merge