Add json support for message responses
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] rebar.config