Translate color picker dialog
Translate color picker dialog
Fix issue #12: Allow sorting of episode list
Merge branch 'episode_list_sorting' into deluxe

Conflicts:
	res/values-es/strings.xml
	res/values-fr/strings.xml