Merge branch 'master' of github.com:AndrewZures/diluvia

Conflicts:
	test/diluvia/util/json_test.exs