Merge branch 'develop' into feature/#118

Conflicts:
	lib/webserver/public/js/site.js