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

Conflicts:
	config/config.yml
added mobile instance and file handler instance to cms listener