added ignore for /resources/language/English/strings.xml
removed strings.xml added some info to addon.xml and version bump
version bump test2
forgot change log
Merge branch 'master' into upstreammaster

* master:
  forgot change log
  version bump test2
  removed strings.xml added some info to addon.xml and version bump
  added ignore for /resources/language/English/strings.xml