fixing the build
fixes
solved conflicts
Merge branch 'master' of https://github.com/mbeddr/mbeddr.core