Merge branch 'develop' into release/v1.1

Conflicts:
	apidoc/template/resource/css/bootstrap.min.css
	apidoc/template/resource/js/bootstrap.min.js