Improve plexbmc photo shelf support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	1080i/Includes.xml
	1080i/Includes_Variables.xml