[SSE]
Merge branch 'master' of https://github.com/josemoralesp/vauxootools

Conflicts:
	vauxootools/serverenv.py