Allow log types
Merge branch 'master' into feature/allow-routing

Conflicts:
	src/debugger/debugger.js