removed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	addons.xml.md5
sync
Merge pull request #98 from o2ri/master

removed