Merge remote-tracking branch 'refs/remotes/origin/Test_new_json'

Conflicts:
	FreeAPS/Sources/APS/APSManager.swift