Test
Merge branch 'develop' of github.com:leonrenkema/gateway into develop

Conflicts:
	index.py