markedcmsnode-7: Starting
Merge remote-tracking branch 'origin/master'

Conflicts:
	jsdav-plugin/JsonRendererPlugin.js
	jsdav-plugin/PageRendererPlugin.js
markedcmsnode-5 Implement rendering as jsDAV plugin