injectToolbar() is back
semantic configuration for debug
Merge remote-tracking branch 'origin/master'