Fixed some build issues.
Merge branch 'slf4j_embedded'
Merge branch 'master' of https://github.com/industry7/Slf4j_Embedded