Use hex version of jazz
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved]mix.lock