Merge branch 'dev' of https://github.com/uProxy/uproxy into freedom_0.6
merge?
Merge branch 'freedom_0.6' of github.com:uProxy/uProxy into willscott-ffoxwork

Conflicts:
	src/interfaces/persistent.d.ts