Fixed x86/x64 string.
Fixed settings panels and fanart size for TV show
sync
fix for conflict
Merge remote-tracking branch 'upstream/master'

Conflicts:
	EmberMediaManager/dlgSettings.Designer.vb
	EmberMediaManager/dlgSettings.resx
	EmberMediaManager/dlgSettings.vb
Merge remote-tracking branch 'upstream/master'
Fixed in thumbnail creation
Merge pull request #81 from msavazzi/master

fixed dlgImgSelect