relates to issue #32.
Merge branch 'origin/develop'

Conflicts:
	lib/webserver/index.js
	lib/webserver/routes/index.js
	package.json