small changes
Merged
Merge branch 'master' of github.com:mbeddr/mbeddr.core

Conflicts:
	code/plugins/sl-all