closes #1176
closes #1182
Merge remote-tracking branch 'origin/master' into webserver.js-refactor

Conflicts:
	public/templates/admin/themes.tpl
	src/meta.js
	src/routes/api.js