documentation
Merge branch 'master' of github.com:dupontmanual/dm-image

Conflicts:
	build.sbt