merge issue
Merge branch 'unstable'

Conflicts:
	gadget.xml