bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/natp_server/views.py