kids
Merge remote-tracking branch 'upstream/master'

Conflicts:
	addons.xml
	addons.xml.md5
Merge remote-tracking branch 'upstream/master'

Conflicts:
	addons.xml
	addons.xml.md5
new addon
Merge branch 'o2ri-master'
Enable kids IL