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

Conflicts:
	api/views.py