Merge branch 'master' of github.com:Florin65/moonbase-other

Conflicts:
	libs/exempi/DEPENDS
	libs/exempi/DETAILS

sync
Merge branch 'master' into florin