Merge pull request #1400 from Montellese/video_tags

Tagging support for tvshows and musicvideos

diff --cc xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
Simple merge

diff --cc xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTags.cpp
Simple merge

diff --cc xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp
Simple merge

diff --cc xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp
Simple merge

diff --cc xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
Simple merge

diff --cc xbmc/interfaces/json-rpc/ServiceDescription.h
Simple merge

diff --cc xbmc/interfaces/json-rpc/VideoLibrary.cpp
Simple merge

diff --cc xbmc/interfaces/json-rpc/methods.json
Simple merge

diff --cc xbmc/video/VideoDatabase.cpp
Simple merge

diff --cc xbmc/video/VideoDatabase.h
Simple merge

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