Merge pull request #916 from theuni/no-gui-scan

No GUI dependency for library scans

diff --cc xbmc/Application.cpp
Simple merge

diff --cc xbmc/GUIInfoManager.cpp
Simple merge

diff --cc xbmc/music/MusicDatabase.cpp
Simple merge

diff --cc xbmc/music/windows/GUIWindowMusicBase.cpp
Simple merge

diff --cc xbmc/video/windows/GUIWindowVideoBase.cpp
Simple merge

diff --cc xbmc/video/windows/GUIWindowVideoNav.cpp
Simple merge