Fix Issue #311 (use Base64 instead of hex encoding)
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Fix Issue #311 (use Base64 instead of hex encoding)

Conflicts:
	src/luks2john.c
	src/luks_fmt_plug.c