Merge branch 'bugfixnewfeatures'
Merge branch 'master' of https://github.com/oel-mediateam/sbplus