things
Merge branch 'develop' of https://github.com/Mu5tank05/Walter into develop

Conflicts:
	plugins/urltools.py