integrating unidoc
Merge branch 'topic/unidoc'

Conflicts:
	project/build.properties
	project/plugins.sbt