log
Merge branch 'master' into release

Conflicts:
	src/controllers/message-manager.js
test