Merge remote-tracking branch 'upstream/master'

# By KB3NZQ (1) and Michael Himmelstein KB3NZQ (1)
* upstream/master:
  plugin broken see addon.xml for more info
  added note for devs
Merge branch 'upstreammaster'

# By KB3NZQ (1) and Michael Himmelstein KB3NZQ (1)
* upstreammaster:
  plugin broken see addon.xml for more info
  added note for devs
plugin broken see addon.xml for more info
Merge branch 'master' of bitbucket.org:thegeekgroup/xbmc-thegeekgroup

# By KB3NZQ (1) and Michael Himmelstein KB3NZQ (1)
* 'master' of bitbucket.org:thegeekgroup/xbmc-thegeekgroup:
  plugin broken see addon.xml for more info
  added note for devs
working on changes
Merge remote-tracking branch 'upstream/master'

# By Michael Himmelstein KB3NZQ (17) and KB3NZQ (1)
# Via Michael Himmelstein KB3NZQ (4) and kb3nzq (2)
* upstream/master:
  Revert "edited attributes"
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  edited attributes
  fixed typo in readme
  added some bits of code i found for playing video by calling the youtube plugin
  added some notes any one is welcome to read and give input
  edited 2 strings for future changes
paste edited attrib
rename
renamed
Merged kb3nzq/xbmc-thegeekgroup into master
renamed notes and added notes to export-ignore
renamed file
working on a fix for playing jtv on xbmc inital round of edits to addon.xml for dependcies
updated to release version 1.1.0
Merge branch 'originDev'

Conflicts:
	.gitattributes
updated to release version 1.1.0
Merged in thegeekgroup/xbmc-thegeekgroup (pull request #2)

updated to 1.1.0
Merge branch 'PersonalBBmaster'

updated to release version 1.1.0