fix plexbmc on deck shelf
Fix issues found in xvmc repo pull
Add Movies entry point customisation
Ver bump
Add option to delay shelf items
Merge remote-tracking branch 'upstream/master'

Conflicts:
	1080i/Settings.xml