removed invalid XML tags
fixed includes
use labels instead of ids
cleaned up strings.po
fixed XML errors
added res tag to addon.xml
Merge commit '8c6ca4ffcf2eedfb06c8591ea22761b01fb6de42' into origin