Fixes for Early Augest 2014
Merge pull request #189 from HIGHWAY99/master

Fixes for Early Augest 2014
Merge branch 'master' into names
Experimental ListItem labels

Add a function get_media_labels to UrlResolver class that returns
media name and thumbnail in a format suitable for ListItem
Cleanup get_media_labels

Return media name, icon and thumbnail.
Use names that won't crash with implementators
Parse media name in promptfile and vidto